Changeset 5831

Timestamp:

08/08/07 16:09:55 (1 year ago)

Author:

gwilson

Message:

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

Files:

• django/trunk/django/db/models/query.py (modified) (1 diff)
• django/trunk/tests/modeltests/basic/models.py (modified) (1 diff)

django/trunk/django/db/models/query.py

@@ -115 +115 @@
-    def __getitem__(self, k):
-        "Retrieve an item or slice from the set of results."
-
+, long
-            raise TypeError
-        assert (not isinstance(k, slice) and (k >= 0)) \

django/trunk/tests/modeltests/basic/models.py

@@ -248 +248 @@
-[<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:
->>> Article.objects.all()[0:5].filter()