diff options
| author | Marcin Kuzminski <marcin@python-works.com> | 2012-03-07 02:18:22 +0200 |
|---|---|---|
| committer | Marcin Kuzminski <marcin@python-works.com> | 2012-03-07 02:18:22 +0200 |
| commit | 769ccd24d9c88f847a66ae0f7d66b332d5257348 (patch) | |
| tree | fb942fc09df2815bbb0202e8626491263e91a3da /rhodecode/model/user.py | |
| parent | 8f0a7827ff7fb54cc2d947c08be8443a46c23906 (diff) | |
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
--HG--
branch : beta
Diffstat (limited to 'rhodecode/model/user.py')
| -rw-r--r-- | rhodecode/model/user.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py index 8bb0f3b8..d2411c27 100644 --- a/rhodecode/model/user.py +++ b/rhodecode/model/user.py @@ -29,7 +29,7 @@ import traceback from pylons import url from pylons.i18n.translation import _ -from rhodecode.lib import safe_unicode +from rhodecode.lib.utils2 import safe_unicode, generate_api_key from rhodecode.lib.caching_query import FromCache from rhodecode.model import BaseModel @@ -40,7 +40,7 @@ from rhodecode.lib.exceptions import DefaultUserException, \ UserOwnsReposException from sqlalchemy.exc import DatabaseError -from rhodecode.lib import generate_api_key + from sqlalchemy.orm import joinedload log = logging.getLogger(__name__) |