Switched existing sqla code over to elixir style.

[zzz-floof.git] / floof / lib / base.py

diff --git a/floof/lib/base.py b/floof/lib/base.py
index d2756ba..4de5e19 100644 (file)
--- a/floof/lib/base.py
+++ b/floof/lib/base.py
@@ -6,15 +6,14 @@ from pylons import session, tmpl_context as c
 from pylons.controllers import WSGIController
 from pylons.templating import render_mako as render
 
-from floof import model
-from floof.model import meta
+from floof.model.users import User
 
 class BaseController(WSGIController):
 
     def __before__(self, action, **params):
         # Fetch current user object
         try:
-            c.user = meta.Session.query(model.User).get(session['user_id'])
+            c.user = User.query.get(session['user_id'])
         except:
             pass
 
@@ -23,7 +22,4 @@ class BaseController(WSGIController):
         # WSGIController.__call__ dispatches to the Controller method
         # the request is routed to. This routing information is
         # available in environ['pylons.routes_dict']
-        try:
-            return WSGIController.__call__(self, environ, start_response)
-        finally:
-            meta.Session.remove()
+        return WSGIController.__call__(self, environ, start_response)