Merge branch 'comments'

[zzz-floof.git] / floof / controllers / account.py

diff --git a/floof/controllers/account.py b/floof/controllers/account.py
index e4f39f3..7dabaa6 100644 (file)
--- a/floof/controllers/account.py
+++ b/floof/controllers/account.py
@@ -5,8 +5,8 @@ from openid.extensions.sreg import SRegRequest, SRegResponse
 from openid.store.filestore import FileOpenIDStore
 from sqlalchemy.orm.exc import NoResultFound
 
 from openid.store.filestore import FileOpenIDStore
 from sqlalchemy.orm.exc import NoResultFound
 

-from pylons import request, response, session, tmpl_context as c, url
-from pylons.controllers.util import abort, redirect_to
+from pylons import request, response, session, tmpl_context as c, url, h
+from pylons.controllers.util import abort, redirect

 from routes import url_for, request_config
 
 from floof.lib.base import BaseController, render
 from routes import url_for, request_config
 
 from floof.lib.base import BaseController, render


@@ -35,7 +35,7 @@ class AccountController(BaseController):
         return_url = url_for(host=host, controller='account', action='login_finish')
         new_url = auth_request.redirectURL(return_to=return_url,
                                            realm=protocol + '://' + host)
         return_url = url_for(host=host, controller='account', action='login_finish')
         new_url = auth_request.redirectURL(return_to=return_url,
                                            realm=protocol + '://' + host)

-        redirect_to(new_url)
+        redirect(new_url)

 
     def login_finish(self):
         """Step two of logging in; the OpenID provider redirects back here."""
 
     def login_finish(self):
         """Step two of logging in; the OpenID provider redirects back here."""


@@ -63,14 +63,14 @@ class AccountController(BaseController):
                 session['register:nickname'] = sreg_res['nickname']
 
             session.save()
                 session['register:nickname'] = sreg_res['nickname']
 
             session.save()

-            redirect_to(url.current(action='register'))
+            redirect(url('register'))

 
         # Remember who's logged in, and we're good to go
         session['user_id'] = user.id
         session.save()
 
         # XXX send me where I came from
 
         # Remember who's logged in, and we're good to go
         session['user_id'] = user.id
         session.save()
 
         # XXX send me where I came from

-        redirect_to('/')
+        redirect('/')

 
     def logout(self):
         """Log user out."""
 
     def logout(self):
         """Log user out."""


@@ -81,7 +81,7 @@ class AccountController(BaseController):
 
         # XXX success message
         # XXX send me where I came from
 
         # XXX success message
         # XXX send me where I came from

-        redirect_to('/')
+        redirect('/')

 
     def register(self):
         """Logging in with an unrecognized identity URL redirects here."""
 
     def register(self):
         """Logging in with an unrecognized identity URL redirects here."""


@@ -116,4 +116,4 @@ class AccountController(BaseController):
 
         # XXX how do we do success messages in some useful way?
         # XXX send me where I came from
 
         # XXX how do we do success messages in some useful way?
         # XXX send me where I came from

-        redirect_to('/')
+        redirect('/')