diff options
author | Marcin Kuzminski <marcin@python-works.com> | 2011-12-29 07:35:51 +0200 |
---|---|---|
committer | Marcin Kuzminski <marcin@python-works.com> | 2011-12-29 07:35:51 +0200 |
commit | c7e7e8b7f7f97240b9a8fe878dbe2d1143abcf55 (patch) | |
tree | 1000d47c7dd39b728d5edb4c1ac2b13f818abcaf /rhodecode/model/user.py | |
parent | 9a52927fd622e7163b932da76c6bf9257890f60b (diff) |
auto white-space removal
--HG--
branch : beta
Diffstat (limited to 'rhodecode/model/user.py')
-rw-r--r-- | rhodecode/model/user.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py index 4187dfff..f9dcf328 100644 --- a/rhodecode/model/user.py +++ b/rhodecode/model/user.py @@ -97,7 +97,7 @@ class UserModel(BaseModel): active=True, admin=False, ldap_dn=None): """ Creates a new instance if not found, or updates current one - + :param username: :param password: :param email: @@ -140,7 +140,7 @@ class UserModel(BaseModel): def create_for_container_auth(self, username, attrs): """ Creates the given user if it's not already in the database - + :param username: :param attrs: """ @@ -173,7 +173,7 @@ class UserModel(BaseModel): """ Checks if user is in database, if not creates this user marked as ldap user - + :param username: :param password: :param user_dn: @@ -283,7 +283,7 @@ class UserModel(BaseModel): def delete(self, user): user = self.__get_user(user) - + try: if user.username == 'default': raise DefaultUserException( @@ -498,9 +498,9 @@ class UserModel(BaseModel): if not isinstance(perm, Permission): raise Exception('perm needs to be an instance of Permission class ' 'got %s instead' % type(perm)) - + user = self.__get_user(user) - + obj = UserToPerm.query().filter(UserToPerm.user == user)\ .filter(UserToPerm.permission == perm).scalar() if obj: |