diff rhodecode/model/user.py @ 1818:cf51bbfb120e beta

auto white-space removal
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 29 Dec 2011 07:35:51 +0200
parents a87aa385f21c
children 89efedac4e6c
line wrap: on
line diff
--- a/rhodecode/model/user.py	Thu Dec 29 06:59:07 2011 +0200
+++ b/rhodecode/model/user.py	Thu Dec 29 07:35:51 2011 +0200
@@ -97,7 +97,7 @@
                          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 @@
     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 @@
         """
         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 @@
 
     def delete(self, user):
         user = self.__get_user(user)
-        
+
         try:
             if user.username == 'default':
                 raise DefaultUserException(
@@ -498,9 +498,9 @@
         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: