From: floguy Date: Fri, 24 Oct 2008 07:51:14 +0000 (+0000) Subject: Fixed some python2.3 backwards incompatibility issues. X-Git-Tag: 1.0.6~19 X-Git-Url: https://git.mdrn.pl/django-pagination.git/commitdiff_plain/5b199b386ec18ea2f7f0b043a293b4da39978334?ds=sidebyside Fixed some python2.3 backwards incompatibility issues. git-svn-id: https://django-pagination.googlecode.com/svn/trunk@38 7f1efe38-554e-0410-b69d-834cb44da2d5 --- diff --git a/pagination/templatetags/pagination_tags.py b/pagination/templatetags/pagination_tags.py index 55bbb13..e566902 100644 --- a/pagination/templatetags/pagination_tags.py +++ b/pagination/templatetags/pagination_tags.py @@ -122,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(first) - second_list = sorted(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 @@ -141,11 +143,14 @@ def paginate(context, window=DEFAULT_WINDOW): pages.append(None) pages.extend(second_list) else: - pages.extend(sorted(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(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 @@ -162,7 +167,9 @@ def paginate(context, window=DEFAULT_WINDOW): pages.append(None) pages.extend(second_list) else: - pages.extend(sorted(last.difference(current))) + differenced = list(last.difference(current)) + differenced.sort() + pages.extend(differenced) to_return = { 'pages': pages, 'page_obj': page_obj,