Changeset - 71738535ed78
[Not reviewed]
beta
0 2 0
Marcin Kuzminski - 14 years ago 2011-09-29 22:57:44
marcin@python-works.com
Removed deprecated usage of UserModel() in simplehg and simplegit
2 files changed with 4 insertions and 4 deletions:
0 comments (0 inline, 0 general)
rhodecode/lib/middleware/simplegit.py
Show inline comments
 
@@ -72,7 +72,7 @@ from paste.httpheaders import REMOTE_USE
 
from rhodecode.lib import safe_str
 
from rhodecode.lib.auth import authfunc, HasPermissionAnyMiddleware
 
from rhodecode.lib.utils import invalidate_cache, check_repo_fast
 
from rhodecode.model.user import UserModel
 
from rhodecode.model.db import User
 

	
 
from webob.exc import HTTPNotFound, HTTPForbidden, HTTPInternalServerError
 

	
 
@@ -262,7 +262,7 @@ class SimpleGit(object):
 
        return repo_name
 

	
 
    def __get_user(self, username):
 
        return UserModel().get_by_username(username, cache=True)
 
        return User.by_username(username)
 

	
 
    def __get_action(self, environ):
 
        """Maps git request commands into a pull or push command.
rhodecode/lib/middleware/simplehg.py
Show inline comments
 
@@ -38,7 +38,7 @@ from rhodecode.lib import safe_str
 
from rhodecode.lib.auth import authfunc, HasPermissionAnyMiddleware
 
from rhodecode.lib.utils import make_ui, invalidate_cache, \
 
    check_repo_fast, ui_sections
 
from rhodecode.model.user import UserModel
 
from rhodecode.model.db import User
 

	
 
from webob.exc import HTTPNotFound, HTTPForbidden, HTTPInternalServerError
 

	
 
@@ -228,7 +228,7 @@ class SimpleHg(object):
 
        return repo_name
 

	
 
    def __get_user(self, username):
 
        return UserModel().get_by_username(username, cache=True)
 
        return User.by_username(username)
 

	
 
    def __get_action(self, environ):
 
        """
0 comments (0 inline, 0 general)