comparison pylons_app/lib/auth.py @ 234:a0116e944da1

changed naming convention for db modules.
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 27 May 2010 21:31:30 +0200
parents b48ebda822a4
children b18f89d6d17f
comparison
equal deleted inserted replaced
233:08e0347351d0 234:a0116e944da1
1 from functools import wraps 1 from functools import wraps
2 from pylons import session, url 2 from pylons import session, url
3 from pylons.controllers.util import abort, redirect 3 from pylons.controllers.util import abort, redirect
4 from pylons_app.model import meta 4 from pylons_app.model import meta
5 from pylons_app.model.db import Users 5 from pylons_app.model.db import User
6 from sqlalchemy.exc import OperationalError 6 from sqlalchemy.exc import OperationalError
7 from sqlalchemy.orm.exc import NoResultFound, MultipleResultsFound 7 from sqlalchemy.orm.exc import NoResultFound, MultipleResultsFound
8 import crypt 8 import crypt
9 import logging 9 import logging
10 log = logging.getLogger(__name__) 10 log = logging.getLogger(__name__)
18 18
19 def authfunc(environ, username, password): 19 def authfunc(environ, username, password):
20 sa = meta.Session 20 sa = meta.Session
21 password_crypt = get_crypt_password(password) 21 password_crypt = get_crypt_password(password)
22 try: 22 try:
23 user = sa.query(Users).filter(Users.username == username).one() 23 user = sa.query(User).filter(User.username == username).one()
24 except (NoResultFound, MultipleResultsFound, OperationalError) as e: 24 except (NoResultFound, MultipleResultsFound, OperationalError) as e:
25 log.error(e) 25 log.error(e)
26 user = None 26 user = None
27 27
28 if user: 28 if user: