# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 1317329864 -10800
# Node ID 71738535ed78261bef4c77b9f737dff70c44af48
# Parent  f4fed0b32103e8818faaaecbc2e3659a158163ad
Removed deprecated usage of UserModel() in simplehg and simplegit

diff -r f4fed0b32103 -r 71738535ed78 rhodecode/lib/middleware/simplegit.py
--- a/rhodecode/lib/middleware/simplegit.py	Thu Sep 29 23:34:47 2011 +0300
+++ b/rhodecode/lib/middleware/simplegit.py	Thu Sep 29 23:57:44 2011 +0300
@@ -72,7 +72,7 @@
 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 @@
         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.
diff -r f4fed0b32103 -r 71738535ed78 rhodecode/lib/middleware/simplehg.py
--- a/rhodecode/lib/middleware/simplehg.py	Thu Sep 29 23:34:47 2011 +0300
+++ b/rhodecode/lib/middleware/simplehg.py	Thu Sep 29 23:57:44 2011 +0300
@@ -38,7 +38,7 @@
 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 @@
         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):
         """