Mercurial > kallithea

comparison rhodecode/model/user.py @ 2109:8ecfed1d8f8b beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
utils/conf - created temporary utils2 - made config.conf for storing some configurations - fixed some dependency import problems - code cleanup - rc-extensions now properly work for celery
author Marcin Kuzminski <marcin@python-works.com>
date Wed, 07 Mar 2012 02:18:22 +0200
parents d4b6c8541bd9
children 273ce1a99c3f
comparison
equal deleted inserted replaced
2108:9e377342802c 2109:8ecfed1d8f8b
27 import traceback 27 import traceback
28 28
29 from pylons import url 29 from pylons import url
30 from pylons.i18n.translation import _ 30 from pylons.i18n.translation import _
31 31
32 from rhodecode.lib import safe_unicode 32 from rhodecode.lib.utils2 import safe_unicode, generate_api_key
33 from rhodecode.lib.caching_query import FromCache 33 from rhodecode.lib.caching_query import FromCache
34 34
35 from rhodecode.model import BaseModel 35 from rhodecode.model import BaseModel
36 from rhodecode.model.db import User, UserRepoToPerm, Repository, Permission, \ 36 from rhodecode.model.db import User, UserRepoToPerm, Repository, Permission, \
37 UserToPerm, UsersGroupRepoToPerm, UsersGroupToPerm, UsersGroupMember, \ 37 UserToPerm, UsersGroupRepoToPerm, UsersGroupToPerm, UsersGroupMember, \
38 Notification, RepoGroup, UserRepoGroupToPerm, UsersGroup 38 Notification, RepoGroup, UserRepoGroupToPerm, UsersGroup
39 from rhodecode.lib.exceptions import DefaultUserException, \ 39 from rhodecode.lib.exceptions import DefaultUserException, \
40 UserOwnsReposException 40 UserOwnsReposException
41 41
42 from sqlalchemy.exc import DatabaseError 42 from sqlalchemy.exc import DatabaseError
43 from rhodecode.lib import generate_api_key 43
44 from sqlalchemy.orm import joinedload 44 from sqlalchemy.orm import joinedload
45 45
46 log = logging.getLogger(__name__) 46 log = logging.getLogger(__name__)
47 47
48 48