Merge pull request #2592 from bagerard/minor_adjustment_w_latest_merge

Minor improvements related with recent merge for queryset_class

Author: bagerard

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

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

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()