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

Merge branch 'master' of https://github.com/lig/mongoengine into dev

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
Harry Marr 2011-03-06 13:11:21 +00:00
commit 69171282e9
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,3 +1,5 @@
.*
!.gitignore
*.pyc *.pyc
.*.swp .*.swp
*.egg *.egg

2
mongoengine/django/auth.py
View File

@ -86,7 +86,7 @@ class User(Document):
else: else:
email = '@'.join([email_name, domain_part.lower()]) email = '@'.join([email_name, domain_part.lower()])
user = User(username=username, email=email, date_joined=now) user = cls(username=username, email=email, date_joined=now)
user.set_password(password) user.set_password(password)
user.save() user.save()
return user return user

9
mongoengine/queryset.py
View File

@ -334,6 +334,7 @@ class QuerySet(object):
self._ordering = [] self._ordering = []
self._snapshot = False self._snapshot = False
self._timeout = True self._timeout = True
self._class_check = True
# If inheritance is allowed, only return instances and instances of # If inheritance is allowed, only return instances and instances of
# subclasses of the class being used # subclasses of the class being used
@ -348,7 +349,8 @@ class QuerySet(object):
def _query(self): def _query(self):
if self._mongo_query is None: if self._mongo_query is None:
self._mongo_query = self._query_obj.to_query(self._document) self._mongo_query = self._query_obj.to_query(self._document)
self._mongo_query.update(self._initial_query) if self._class_check:
self._mongo_query.update(self._initial_query)
return self._mongo_query return self._mongo_query
def ensure_index(self, key_or_list, drop_dups=False, background=False, def ensure_index(self, key_or_list, drop_dups=False, background=False,
@ -399,7 +401,7 @@ class QuerySet(object):
return index_list return index_list
def __call__(self, q_obj=None, **query): def __call__(self, q_obj=None, class_check=True, **query):
"""Filter the selected documents by calling the """Filter the selected documents by calling the
:class:`~mongoengine.queryset.QuerySet` with a query. :class:`~mongoengine.queryset.QuerySet` with a query.
@ -407,6 +409,8 @@ class QuerySet(object):
the query; the :class:`~mongoengine.queryset.QuerySet` is filtered the query; the :class:`~mongoengine.queryset.QuerySet` is filtered
multiple times with different :class:`~mongoengine.queryset.Q` multiple times with different :class:`~mongoengine.queryset.Q`
objects, only the last one will be used objects, only the last one will be used
:param class_check: If set to False bypass class name check when
querying collection
:param query: Django-style query keyword arguments :param query: Django-style query keyword arguments
""" """
#if q_obj: #if q_obj:
@ -417,6 +421,7 @@ class QuerySet(object):
self._query_obj &= query self._query_obj &= query
self._mongo_query = None self._mongo_query = None
self._cursor_obj = None self._cursor_obj = None
self._class_check = class_check
return self return self
def filter(self, *q_objs, **query): def filter(self, *q_objs, **query):