pub/mongoengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed wire_concern usage and cosmetics

Browse Source
This commit is contained in:
Matthieu Rigal 2015-05-07 19:34:31 +02:00
parent f97db93212
commit 794101691c
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mongoengine/queryset/base.py
View File

@ -940,7 +940,7 @@ class BaseQuerySet(object):
.. deprecated:: Ignored with PyMongo 3+ .. deprecated:: Ignored with PyMongo 3+
""" """
if IS_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) warnings.warn(msg, DeprecationWarning)
queryset = self.clone() queryset = self.clone()
queryset._snapshot = enabled queryset._snapshot = enabled
@ -966,7 +966,7 @@ class BaseQuerySet(object):
.. deprecated:: Ignored with PyMongo 3+ .. deprecated:: Ignored with PyMongo 3+
""" """
if IS_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) warnings.warn(msg, DeprecationWarning)
queryset = self.clone() queryset = self.clone()
queryset._slave_okay = enabled queryset._slave_okay = enabled

11
mongoengine/queryset/transform.py
View File

@ -128,20 +128,15 @@ def query(_doc_cls=None, _field_operation=False, **query):
mongo_query[key].update(value) mongo_query[key].update(value)
# $maxDistance needs to come last - convert to SON # $maxDistance needs to come last - convert to SON
value_dict = mongo_query[key] 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() value_son = SON()
if isinstance(value_dict['$near'], dict): if isinstance(value_dict['$near'], dict):
for k, v in value_dict.iteritems(): for k, v in value_dict.iteritems():
if k == '$maxDistance': if k == '$maxDistance':
continue continue
value_son[k] = v value_son[k] = v
if (get_connection().max_wire_version <= 1): value_son['$near'] = SON(value_son['$near'])
value_son['$maxDistance'] = value_dict[ value_son['$near']['$maxDistance'] = value_dict['$maxDistance']
'$maxDistance']
else:
value_son['$near'] = SON(value_son['$near'])
value_son['$near'][
'$maxDistance'] = value_dict['$maxDistance']
else: else:
for k, v in value_dict.iteritems(): for k, v in value_dict.iteritems():
if k == '$maxDistance': if k == '$maxDistance':

13
tests/queryset/queryset.py
View File

@ -708,6 +708,11 @@ class QuerySetTest(unittest.TestCase):
Blog.drop_collection() 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 # Recreates the collection
self.assertEqual(0, Blog.objects.count()) self.assertEqual(0, Blog.objects.count())
@ -724,7 +729,7 @@ class QuerySetTest(unittest.TestCase):
blogs.append(Blog(title="post %s" % i, posts=[post1, post2])) blogs.append(Blog(title="post %s" % i, posts=[post1, post2]))
Blog.objects.insert(blogs, load_bulk=False) Blog.objects.insert(blogs, load_bulk=False)
if (get_connection().max_wire_version <= 1): if mongodb_version < (2, 6):
self.assertEqual(q, 1) self.assertEqual(q, 1)
else: else:
# profiling logs each doc now in the bulk op # profiling logs each doc now in the bulk op
@ -737,7 +742,7 @@ class QuerySetTest(unittest.TestCase):
self.assertEqual(q, 0) self.assertEqual(q, 0)
Blog.objects.insert(blogs) 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 self.assertEqual(q, 2) # 1 for insert, and 1 for in bulk fetch
else: else:
# 99 for insert, and 1 for in bulk fetch # 99 for insert, and 1 for in bulk fetch
@ -869,8 +874,10 @@ class QuerySetTest(unittest.TestCase):
self.assertEqual(q, 3) self.assertEqual(q, 3)
@skip_pymongo3
def test_slave_okay(self): 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 = self.Person(name="User A", age=20)
person1.save() person1.save()