Fixed #5115 -- Fixed `QuerySet` slices to allow longs.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@5831 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Gary Wilson Jr 2007-08-08 21:09:55 +00:00
parent 9170744304
commit 049212e950
2 changed files with 14 additions and 1 deletions

View File

@ -114,7 +114,7 @@ class _QuerySet(object):
def __getitem__(self, k): def __getitem__(self, k):
"Retrieve an item or slice from the set of results." "Retrieve an item or slice from the set of results."
if not isinstance(k, (slice, int)): if not isinstance(k, (slice, int, long)):
raise TypeError raise TypeError
assert (not isinstance(k, slice) and (k >= 0)) \ assert (not isinstance(k, slice) and (k >= 0)) \
or (isinstance(k, slice) and (k.start is None or k.start >= 0) and (k.stop is None or k.stop >= 0)), \ or (isinstance(k, slice) and (k.start is None or k.start >= 0) and (k.stop is None or k.stop >= 0)), \

View File

@ -247,6 +247,19 @@ datetime.datetime(2005, 7, 28, 0, 0)
>>> (s1 | s2 | s3)[::2] >>> (s1 | s2 | s3)[::2]
[<Article: Area woman programs in Python>, <Article: Third article>] [<Article: Area woman programs in Python>, <Article: Third article>]
# Slicing works with longs.
>>> Article.objects.all()[0L]
<Article: Area woman programs in Python>
>>> Article.objects.all()[1L:3L]
[<Article: Second article>, <Article: Third article>]
>>> s3 = Article.objects.filter(id__exact=3)
>>> (s1 | s2 | s3)[::2L]
[<Article: Area woman programs in Python>, <Article: Third article>]
# And can be mixed with ints.
>>> Article.objects.all()[1:3L]
[<Article: Second article>, <Article: Third article>]
# Slices (without step) are lazy: # Slices (without step) are lazy:
>>> Article.objects.all()[0:5].filter() >>> Article.objects.all()[0:5].filter()
[<Article: Area woman programs in Python>, <Article: Second article>, <Article: Third article>, <Article: Article 6>, <Article: Default headline>] [<Article: Area woman programs in Python>, <Article: Second article>, <Article: Third article>, <Article: Article 6>, <Article: Default headline>]