X-Git-Url: https://git.mdrn.pl/django-pagination.git/blobdiff_plain/bfae3c1f7faa2fb712f34de01f865eb45081ca62..59500533db29f189154369ce87f0027f2d0cd84c:/linaro_django_pagination/middleware.py?ds=sidebyside diff --git a/linaro_django_pagination/middleware.py b/linaro_django_pagination/middleware.py index ad00fb2..580be43 100644 --- a/linaro_django_pagination/middleware.py +++ b/linaro_django_pagination/middleware.py @@ -1,11 +1,11 @@ # Copyright (c) 2008, Eric Florenzano # Copyright (c) 2010, 2011 Linaro Limited # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are # met: -# +# # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # * Redistributions in binary form must reproduce the above @@ -15,7 +15,7 @@ # * Neither the name of the author nor the names of other # contributors may be used to endorse or promote products derived # from this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -35,7 +35,12 @@ def get_page(self, suffix): integer representing the current page. """ try: - return int(self.REQUEST['page%s' % suffix]) + # REQUEST is deprecated as of Django 1.7. + key = 'page%s' % suffix + value = self.POST.get(key) + if value is None: + value = self.GET.get(key) + return int(value) except (KeyError, ValueError, TypeError): return 1