Fix for PyMongo3+

This commit is contained in:
Matthieu Rigal 2015-06-22 16:40:50 +02:00
parent 40f6df7160
commit 9063b559c4

View File

@ -7,6 +7,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.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][