From 1dfae8eecba58adb311514ce7f284ed610834d6c Mon Sep 17 00:00:00 2001 From: Eevee Date: Sun, 6 Dec 2009 02:16:52 -0800 Subject: [PATCH] Stop using pylons.h. --- floof/controllers/art.py | 4 ++-- floof/controllers/gallery.py | 3 ++- floof/controllers/relation.py | 3 ++- floof/controllers/search.py | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/floof/controllers/art.py b/floof/controllers/art.py index bf928f0..7c371ed 100644 --- a/floof/controllers/art.py +++ b/floof/controllers/art.py @@ -1,13 +1,13 @@ import logging -from pylons import config, request, response, session, tmpl_context as c, h +from pylons import config, request, response, session, tmpl_context as c from pylons.controllers.util import abort, redirect from pylons import url from floof.lib.base import BaseController, render log = logging.getLogger(__name__) -from floof.lib import file_storage as storage +from floof.lib import file_storage as storage, helpers as h from floof.model import Art, Rating, ArtUser from floof.model.art import ArtUserType from floof.model.comments import Discussion diff --git a/floof/controllers/gallery.py b/floof/controllers/gallery.py index e923e30..4a4ea5b 100644 --- a/floof/controllers/gallery.py +++ b/floof/controllers/gallery.py @@ -1,9 +1,10 @@ import logging -from pylons import request, response, session, tmpl_context as c, h +from pylons import request, response, session, tmpl_context as c from pylons.controllers.util import abort, redirect from pylons import url +from floof.lib import helpers as h from floof.lib.base import BaseController, render log = logging.getLogger(__name__) diff --git a/floof/controllers/relation.py b/floof/controllers/relation.py index 48e7a46..719fe2b 100644 --- a/floof/controllers/relation.py +++ b/floof/controllers/relation.py @@ -1,8 +1,9 @@ import logging -from pylons import request, response, session, tmpl_context as c, h, url +from pylons import request, response, session, tmpl_context as c, url from pylons.controllers.util import abort, redirect +from floof.lib import helpers as h from floof.lib.base import BaseController, render log = logging.getLogger(__name__) diff --git a/floof/controllers/search.py b/floof/controllers/search.py index 53343dd..8617966 100644 --- a/floof/controllers/search.py +++ b/floof/controllers/search.py @@ -1,9 +1,10 @@ import logging -from pylons import request, response, session, tmpl_context as c, h +from pylons import request, response, session, tmpl_context as c from pylons.controllers.util import abort, redirect from pylons import url +from floof.lib import helpers as h from floof.lib.base import BaseController, render from floof.lib.tags import parse -- 2.7.4