aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/decorators.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-05-19 22:39:15 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-05-19 22:39:15 -0500
commit1301a8ad57672ae48afddf31d4951222ef8b5ff0 (patch)
tree4abfd7186b06490e6545fb092b73a485db59fdfd /mediagoblin/decorators.py
parentaf4d0b5cb0de2cbc9dd78a791fd77dab3dbddaa5 (diff)
downloadmediagoblin-1301a8ad57672ae48afddf31d4951222ef8b5ff0.tar.lz
mediagoblin-1301a8ad57672ae48afddf31d4951222ef8b5ff0.tar.xz
mediagoblin-1301a8ad57672ae48afddf31d4951222ef8b5ff0.zip
Reorganizing the uses_pagination decorator a little and having it pass
in the page number to the view
Diffstat (limited to 'mediagoblin/decorators.py')
-rw-r--r--mediagoblin/decorators.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py
index 161d99ff..8f107b6f 100644
--- a/mediagoblin/decorators.py
+++ b/mediagoblin/decorators.py
@@ -52,14 +52,12 @@ def uses_pagination(controller):
"""
def wrapper(request, *args, **kwargs):
try:
- page = int(request.str_GET['page'])
+ page = int(request.GET.get('page', 1))
if page < 0:
return exc.HTTPNotFound()
except ValueError:
return exc.HTTPNotFound()
- except KeyError:
- request.str_GET['page'] = 1
- return controller(request, *args, **kwargs)
+ return controller(request, page, *args, **kwargs)
return _make_safe(wrapper,controller)