Merge branch 'master' of https://github.com/grubberr/mongoengine into slice

This commit is contained in:
Ross Lawley 2011-11-01 02:14:44 -07:00
commit 7d808b483e

View File

@ -1648,10 +1648,16 @@ class QuerySet(object):
def __repr__(self): def __repr__(self):
limit = REPR_OUTPUT_SIZE + 1 limit = REPR_OUTPUT_SIZE + 1
if self._limit is not None and self._limit < limit: start = ( 0 if self._skip is None else self._skip )
limit = self._limit if self._limit is None:
stop = start + limit
if self._limit is not None:
if self._limit - start > limit:
stop = start + limit
else:
stop = self._limit
try: try:
data = list(self[self._skip:limit]) data = list(self[start:stop])
except pymongo.errors.InvalidOperation: except pymongo.errors.InvalidOperation:
return ".. queryset mid-iteration .." return ".. queryset mid-iteration .."
if len(data) > REPR_OUTPUT_SIZE: if len(data) > REPR_OUTPUT_SIZE: