Made the Paginator class a bit more backwards compatible with the lecacy `ObjectPaginator` class by using the `ObjectPaginator`'s `_get_count` method. Instead of explicitly checking for an instance of `QuerySet`, this now allows any object with a `count()` or `__len__()` method defined to be passed to Paginator. For one, this is useful when you have custom `QuerySet`-like classes that implement a `count()` method but don't inherit from `QuerySet` explicitly.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8121 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 25 insertions, 0 deletions

diff --git a/tests/modeltests/pagination/models.py b/tests/modeltests/pagination/models.py
index 834c8e5ebd..e8b373e158 100644
--- a/tests/modeltests/pagination/models.py
+++ b/tests/modeltests/pagination/models.py
@@ -140,6 +140,31 @@ True
 >>> p.end_index()
 5
 
+# Paginator can be passed other objects with a count() method.
+>>> class CountContainer:
+...     def count(self):
+...         return 42
+>>> paginator = Paginator(CountContainer(), 10)
+>>> paginator.count
+42
+>>> paginator.num_pages
+5
+>>> paginator.page_range
+[1, 2, 3, 4, 5]
+
+# Paginator can be passed other objects that implement __len__.
+>>> class LenContainer:
+...     def __len__(self):
+...         return 42
+>>> paginator = Paginator(LenContainer(), 10)
+>>> paginator.count
+42
+>>> paginator.num_pages
+5
+>>> paginator.page_range
+[1, 2, 3, 4, 5]
+
+
 ################################
 # Legacy API (ObjectPaginator) #
 ################################