From 769ccd24d9c88f847a66ae0f7d66b332d5257348 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@python-works.com>
Date: Wed, 7 Mar 2012 02:18:22 +0200
Subject: 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
---
 rhodecode/model/user.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'rhodecode/model/user.py')

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__)
-- 
cgit v1.2.3