Changeset 9202

Timestamp:

10/08/08 03:38:33 (2 months ago)

Author:

mtredinnick

Message:

Fixed #6748 -- When printing the repr() of querysets, don't load or display
more than 20 objects.

This means that accidentally executing HugeStoryArchive?.objects.all() at the
interactive prompt (or in the debug template) won't try to load all 4,233,010
stories into memory and print them out. That would previously cause resource
starvation and other "interesting" crashes.

If you really, really want the previous behaviour (e.g. in a doctest that
prints more than 20 items), display "list(qs)" instead of just "qs".

Files:

• django/trunk/django/db/models/query.py (modified) (2 diffs)
• django/trunk/tests/regressiontests/queries/models.py (modified) (1 diff)

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

@@ -15 +15 @@
-CHUNK_SIZE = 100
-ITER_CHUNK_SIZE = CHUNK_SIZE
+
+# The maximum number of items to display in a QuerySet.__repr__
+REPR_OUTPUT_SIZE = 20
-
-# Pull into this namespace for backwards compatibility.
@@ -142 +145 @@
-
-    def __repr__(self):
-
+
+
+
+
-
-    def __len__(self):

django/trunk/tests/regressiontests/queries/models.py

@@ -557 +557 @@
-# ordering, but that isn't needed here.
->>> qs = Item.objects.order_by('name')
-qs
+list(qs)
-[<Item: four>, <Item: one>, <Item: three>, <Item: two>]
->>> len(qs.query.tables)