Changeset 7819

Timestamp:

07/01/08 23:31:28 (3 months ago)

Author:

gwilson

Message:

Made legacy ObjectPaginator truly backwards-compatible by catching both AttributeError and TypeError in _get_count as it did before
[7306]. Tests included.

Files:

• django/trunk/django/core/paginator.py (modified) (1 diff)
• django/trunk/tests/modeltests/pagination/models.py (modified) (1 diff)

django/trunk/django/core/paginator.py

@@ -174 +174 @@
-            try:
-                self._count = self.object_list.count()
-
+
+
+
+
-                self._count = len(self.object_list)
-        return self._count

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

@@ -201 +201 @@
-[1]
-
+# ObjectPaginator can be passed lists too.
+>>> paginator = ObjectPaginator([1, 2, 3], 5)
+>>> paginator.hits
+3
+>>> paginator.pages
+1
+>>> paginator.page_range
+[1]
+
+
+# ObjectPaginator can be passed other objects with a count() method.
+>>> class Container:
+...     def __len__(self):
+...         return 42
+>>> paginator = ObjectPaginator(Container(), 10)
+>>> paginator.hits
+42
+>>> paginator.pages
+5
+>>> paginator.page_range
+[1, 2, 3, 4, 5]
+
+
-##################
-# Orphan support #