ericflo · ma1onso · Feb 21, 2013 · Feb 21, 2013 · Dec 14, 2015 · Dec 14, 2015
diff --git a/.gitignore b/.gitignore
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/README.md b/README.md
@@ -0,0 +1,6 @@
+django-pagination
+=================
+
+A set of utilities for creating robust pagination tools throughout a django application.
+
+Fork from: https://github.com/ericflo/django-pagination
diff --git a/docs/index.txt b/docs/index.txt
diff --git a/docs/install.txt b/docs/install.txt
diff --git a/docs/usage.txt b/docs/usage.txt
diff --git a/pagination/__init__.py b/pagination/__init__.py
diff --git a/pagination/locale/de/LC_MESSAGES/django.mo b/pagination/locale/de/LC_MESSAGES/django.mo
diff --git a/pagination/locale/de/LC_MESSAGES/django.po b/pagination/locale/de/LC_MESSAGES/django.po
diff --git a/pagination/locale/fr/LC_MESSAGES/django.mo b/pagination/locale/fr/LC_MESSAGES/django.mo
diff --git a/pagination/locale/fr/LC_MESSAGES/django.po b/pagination/locale/fr/LC_MESSAGES/django.po
diff --git a/pagination/locale/pl/LC_MESSAGES/django.mo b/pagination/locale/pl/LC_MESSAGES/django.mo
diff --git a/pagination/locale/pl/LC_MESSAGES/django.po b/pagination/locale/pl/LC_MESSAGES/django.po
diff --git a/pagination/locale/pt/LC_MESSAGES/django.mo b/pagination/locale/pt/LC_MESSAGES/django.mo
diff --git a/pagination/locale/pt/LC_MESSAGES/django.po b/pagination/locale/pt/LC_MESSAGES/django.po
diff --git a/pagination/middleware.py b/pagination/middleware.py
@@ -1,17 +1,19 @@
+from django.utils.deprecation import MiddlewareMixin
+
 def get_page(self):
     """
     A function which will be monkeypatched onto the request to get the current
     integer representing the current page.
     """
     try:
-        return int(self.REQUEST['page'])
+        return int(self.GET.get('page'))
     except (KeyError, ValueError, TypeError):
         return 1
 
-class PaginationMiddleware(object):
+class PaginationMiddleware(MiddlewareMixin):
     """
     Inserts a variable representing the current page onto the request object if
     it exists in either **GET** or **POST** portions of the request.
     """
     def process_request(self, request):
-        request.__class__.page = property(get_page)
+        request.__class__.page = property(get_page)
diff --git a/pagination/models.py b/pagination/models.py
diff --git a/pagination/paginator.py b/pagination/paginator.py
diff --git a/pagination/templates/pagination/pagination.html b/pagination/templates/pagination/pagination.html
diff --git a/pagination/templatetags/__init__.py b/pagination/templatetags/__init__.py
diff --git a/pagination/templatetags/pagination_tags.py b/pagination/templatetags/pagination_tags.py
@@ -133,7 +133,7 @@ def paginate(context, window=DEFAULT_WINDOW, hashtag=''):
     try:
         paginator = context['paginator']
         page_obj = context['page_obj']
-        page_range = paginator.page_range
+        page_range = list(paginator.page_range)
         # Calculate the record range in the current page for display.
         records = {'first': 1 + (page_obj.number - 1) * paginator.per_page}
         records['last'] = records['first'] + paginator.per_page - 1
@@ -222,7 +222,7 @@ def paginate(context, window=DEFAULT_WINDOW, hashtag=''):
             else:
                 to_return['getvars'] = ''
         return to_return
-    except KeyError, AttributeError:
+    except (KeyError, AttributeError):
         return {}
 
 register.inclusion_tag('pagination/pagination.html', takes_context=True)(

diff --git a/pagination/tests.py b/pagination/tests.py
diff --git a/setup.py b/setup.py
diff --git a/tests/runtests.py b/tests/runtests.py
diff --git a/tests/settings.py b/tests/settings.py