X-Git-Url: https://git.mdrn.pl/django-pagination.git/blobdiff_plain/9a75cd947e2a00684bbd01d7d60124e0d9919b00..5b199b386ec18ea2f7f0b043a293b4da39978334:/pagination/templatetags/pagination_tags.py

diff --git a/pagination/templatetags/pagination_tags.py b/pagination/templatetags/pagination_tags.py
index 36cd125..e566902 100644
--- a/pagination/templatetags/pagination_tags.py
+++ b/pagination/templatetags/pagination_tags.py
@@ -4,7 +4,7 @@ except NameError:
     from sets import Set as set
 from django import template
 from django.db.models.query import QuerySet
-from django.core.paginator import Paginator, QuerySetPaginator, InvalidPage
+from django.core.paginator import Paginator, InvalidPage
 from django.conf import settings
 
 register = template.Library()
@@ -43,16 +43,9 @@ class AutoPaginateNode(template.Node):
     """
     Emits the required objects to allow for Digg-style pagination.
     
-    First, it looks in the current context for the variable specified.  This
-    should be either a QuerySet or a list.
-    
-    1. If it is a QuerySet, this ``AutoPaginateNode`` will emit a 
-       ``QuerySetPaginator`` and the current page object into the context names
-       ``paginator`` and ``page_obj``, respectively.
-    
-    2. If it is a list, this ``AutoPaginateNode`` will emit a simple
-       ``Paginator`` and the current page object into the context names 
-       ``paginator`` and ``page_obj``, respectively.
+    First, it looks in the current context for the variable specified, and using
+    that object, it emits a simple ``Paginator`` and the current page object 
+    into the context names ``paginator`` and ``page_obj``, respectively.
     
     It will then replace the variable specified with only the objects for the
     current page.
@@ -61,7 +54,7 @@ class AutoPaginateNode(template.Node):
         
         It is recommended to use *{% paginate %}* after using the autopaginate
         tag.  If you choose not to use *{% paginate %}*, make sure to display the
-        list of availabale pages, or else the application may seem to be buggy.
+        list of available pages, or else the application may seem to be buggy.
     """
     def __init__(self, queryset_var, paginate_by=DEFAULT_PAGINATION, orphans=DEFAULT_ORPHANS):
         self.queryset_var = template.Variable(queryset_var)
@@ -71,17 +64,7 @@ class AutoPaginateNode(template.Node):
     def render(self, context):
         key = self.queryset_var.var
         value = self.queryset_var.resolve(context)
-        if issubclass(value.__class__, QuerySet):
-            model = value.model
-            paginator_class = QuerySetPaginator
-        else:
-            value = list(value)
-            try:
-                model = value[0].__class__
-            except IndexError:
-                return u''
-            paginator_class = Paginator
-        paginator = paginator_class(value, self.paginate_by, self.orphans)
+        paginator = Paginator(value, self.paginate_by, self.orphans)
         try:
             page_obj = paginator.page(context['request'].page)
         except InvalidPage:
@@ -139,8 +122,10 @@ def paginate(context, window=DEFAULT_WINDOW):
         # If there's no overlap between the first set of pages and the current
         # set of pages, then there's a possible need for elusion.
         if len(first.intersection(current)) == 0:
-            first_list = sorted(list(first))
-            second_list = sorted(list(current))
+            first_list = list(first)
+            first_list.sort()
+            second_list = list(second)
+            second_list.sort()
             pages.extend(first_list)
             diff = second_list[0] - first_list[-1]
             # If there is a gap of two, between the last page of the first
@@ -158,11 +143,14 @@ def paginate(context, window=DEFAULT_WINDOW):
                 pages.append(None)
             pages.extend(second_list)
         else:
-            pages.extend(sorted(list(first.union(current))))
+            unioned = list(first.union(current))
+            unioned.sort()
+            pages.extend(unioned)
         # If there's no overlap between the current set of pages and the last
         # set of pages, then there's a possible need for elusion.
         if len(current.intersection(last)) == 0:
-            second_list = sorted(list(last))
+            second_list = list(last)
+            second_list.sort()
             diff = second_list[0] - pages[-1]
             # If there is a gap of two, between the last page of the current
             # set and the first page of the last set, then we're missing a 
@@ -179,7 +167,9 @@ def paginate(context, window=DEFAULT_WINDOW):
                 pages.append(None)
             pages.extend(second_list)
         else:
-            pages.extend(sorted(list(last.difference(current))))
+            differenced = list(last.difference(current))
+            differenced.sort()
+            pages.extend(differenced)
         to_return = {
             'pages': pages,
             'page_obj': page_obj,