1 files changed, 6 insertions, 6 deletions
diff --git a/jm2l/models.py b/jm2l/models.py
index 9e33644..0bc212c 100644
--- a/jm2l/models.py
+++ b/jm2l/models.py
@@ -19,9 +19,9 @@ from sqlalchemy import (
     )
 
 from slugify import slugify
-from webhelpers.text import urlify
-from webhelpers.paginate import PageURL_WebOb, Page
-from webhelpers.date import time_ago_in_words
+from webhelpers2.text import urlify
+from webhelpers2.date import time_ago_in_words
+from paginate import Page
 from collections import namedtuple
 
 
@@ -587,7 +587,7 @@ class Entry(Base):
     
     @classmethod
     def all(cls):
-        return DBSession.query(Entry).order_by(sa.desc(Entry.created))
+        return DBSession.query(Entry).order_by(sa.desc(Entry.created)).all()
     
     @classmethod
     def by_id(cls, id):
@@ -603,8 +603,8 @@ class Entry(Base):
     
     @classmethod
     def get_paginator(cls, request, page=1):
-        page_url = PageURL_WebOb(request)
-        return Page(Entry.all(), page, url=page_url, items_per_page=5)
+        return Page(Entry.all(), page, items_per_page=5,
+                    url_maker=lambda p: "%s?page=%s" % (request.application_url, p))
 
 #class Seances(Base):
 #    __tablename__ = 'seances'