Merge fixes

This commit is contained in:
Ross Lawley
2013-04-17 14:27:33 +00:00
parent 51e50bf0a9
commit 420376d036
3 changed files with 22 additions and 10 deletions

View File

@@ -1138,8 +1138,13 @@ class QuerySet(object):
if self._hint != -1:
self._cursor_obj.hint(self._hint)
return self._cursor_obj
def __deepcopy__(self, memo):
"""Essential for chained queries with ReferenceFields involved"""
return self.clone()
@property
def _query(self):
if self._mongo_query is None:
@@ -1302,6 +1307,9 @@ class QuerySet(object):
except:
pass
key_list.append((key, direction))
if self._cursor_obj:
self._cursor_obj.sort(key_list)
return key_list
def _get_scalar(self, doc):