Merge branch 'master' of github.com:mitsuhiko/flask-sqlalchemy

mitsuhiko · mitsuhiko · commit 21b4add51993 · 2013-05-15T17:26:39.000+01:00
diff --git a/flask_sqlalchemy.py b/flask_sqlalchemy.py
@@ -276,7 +276,11 @@ def __init__(self, query, page, per_page, total, items):
     @property
     def pages(self):
         """The total number of pages"""
-        return int(ceil(self.total / float(self.per_page)))
+        if self.per_page == 0:
+            pages = 0
+        else:
+            pages = int(ceil(self.total / float(self.per_page)))
+        return pages
 
     def prev(self, error_out=False):
         """Returns a :class:`Pagination` object for the previous page."""
diff --git a/test_sqlalchemy.py b/test_sqlalchemy.py
@@ -189,6 +189,10 @@ def test_basic_pagination(self):
         self.assertEqual(list(p.iter_pages()),
                          [1, 2, None, 8, 9, 10, 11, 12, 13, 14, None, 24, 25])
 
+    def test_pagination_pages_when_0_items_per_page(self):
+        p = sqlalchemy.Pagination(None, 1, 0, 500, [])
+        self.assertEqual(p.pages, 0)
+
 
 class BindsTestCase(unittest.TestCase):
 
