kallithea Changeset - 71738535ed78

Changeset - 71738535ed78

Parent rev.

Child rev.

[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:

rhodecode/lib/middleware/simplegit.py

rhodecode/lib/middleware/simplehg.py

0 comments (0 inline, 0 general)

rhodecode/lib/middleware/simplegit.py

➞

Show inline comments

@@ @@ -69,13 +69,13 @@ from dulwich.web import HTTPGitApplicati @@
 from paste.auth.basic import AuthBasicAuthenticator
 from paste.httpheaders import REMOTE_USER, AUTH_TYPE
 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
 log = logging.getLogger(__name__)
@@ @@ -259,13 +259,13 @@ class SimpleGit(object): @@
             log.error(traceback.format_exc())
             raise
         repo_name = repo_name.split('/')[0]
         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.
         :param environ:
         """

rhodecode/lib/middleware/simplehg.py

➞

Show inline comments

@@ @@ -35,13 +35,13 @@ from paste.auth.basic import AuthBasicAu @@
 from paste.httpheaders import REMOTE_USER, AUTH_TYPE
 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
 log = logging.getLogger(__name__)
@@ @@ -225,13 +225,13 @@ class SimpleHg(object): @@
             log.error(traceback.format_exc())
             raise
         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 mercurial request commands into a clone,pull or push command.
         This should always return a valid command string

0 comments (0 inline, 0 general)