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

left some conflict markers in - oops

Browse Source
This commit is contained in:
John Arnfield 2011-08-17 20:14:24 +01:00
parent bd005575c4
commit 88cb8f3963
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mongoengine/queryset.py
View File

@ -617,15 +617,9 @@ class QuerySet(object):
"""
operators = ['ne', 'gt', 'gte', 'lt', 'lte', 'in', 'nin', 'mod',
'all', 'size', 'exists', 'not']
<<<<<<< HEAD
geo_operators = ['within_distance', 'within_spherical_distance', 'within_box', 'near', 'near_sphere']
geo_operators = ['within_distance', 'within_spherical_distance', 'within_box', 'within_polygon' 'near', 'near_sphere']
match_operators = ['contains', 'icontains', 'startswith',
'istartswith', 'endswith', 'iendswith',
=======
geo_operators = ['within_distance', 'within_spherical_distance', 'within_box', 'within_polygon', 'near', 'near_sphere']
match_operators = ['contains', 'icontains', 'startswith',
'istartswith', 'endswith', 'iendswith',
>>>>>>> master
'exact', 'iexact']
mongo_query = {}