Merge pull request #2097 from bagerard/remove_deprecated_pymongo_methods

remove pymongo deprecated methods: find_and_modify & remove
2019-06-24 22:03:58 +02:00
parent a4fe091a51 8f57279dc7
commit b1002dd4f9
3 changed files with 18 additions and 13 deletions
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -481,9 +481,10 @@ class BaseQuerySet(object):
                    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):