merged suff, commented out some of my own

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

diff --git a/floof/controllers/users.py b/floof/controllers/users.py
index 1a79c15..7c24c0f 100644 (file)
--- a/floof/controllers/users.py
+++ b/floof/controllers/users.py
@@ -2,7 +2,6 @@ import logging
 
 from pylons import request, response, session, tmpl_context as c
 from pylons.controllers.util import abort, redirect_to
 
 from pylons import request, response, session, tmpl_context as c
 from pylons.controllers.util import abort, redirect_to

-from sqlalchemy import func

 from sqlalchemy.orm.exc import NoResultFound
 
 from floof.lib.base import BaseController, render
 from sqlalchemy.orm.exc import NoResultFound
 
 from floof.lib.base import BaseController, render


@@ -24,8 +23,7 @@ class UsersController(BaseController):
         """Userpage."""
 
         try:
         """Userpage."""
 
         try:

-            c.this_user = User.query.filter(func.lower(User.name) == name) \
-                              .one()
+            c.this_user = User.get_by(name=name)

         except NoResultFound:
             abort(404)
 
         except NoResultFound:
             abort(404)