Merge branch 'release/0.4'

laurentguilbert · Jul 11, 2016 · fd757c0 · fd757c0
2 parents b694ef0 + be031dd
commit fd757c0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/tests/test_paginator.py b/tests/test_paginator.py
@@ -68,6 +68,8 @@ class Request(object):
 
         self.assertEqual(view.page_size, 2)
 
+        view.request.GET = {}
+        self.assertEqual(view.get_page_number(), 1)
         view.request.GET = {'page': -2}
         self.assertEqual(view.get_page_number(), 1)
         view.request.GET = {'page': 'foobar'}

diff --git a/trampoline/views.py b/trampoline/views.py
@@ -15,8 +15,8 @@ def get_search(self):
     def get_page_number(self):
         number = 1
         try:
-            number = int(self.request.GET['page'])
-        except (TypeError, ValueError, AttributeError):
+            number = int(self.request.GET.get('page'))
+        except (TypeError, ValueError):
             pass
         if number < 1:
             number = 1