aboutsummaryrefslogtreecommitdiff
path: root/rhodecode/model/user.py
diff options
context:
space:
mode:
authorNicolas VINOT <aeris@imirhil.fr>2011-10-23 01:16:55 +0200
committerNicolas VINOT <aeris@imirhil.fr>2011-10-23 01:16:55 +0200
commit52272d32c5ba072a2488802a4404d54ce81471f4 (patch)
tree90861f375e2296aa3bcf041c66dd581f2f709a9a /rhodecode/model/user.py
parent3e83af842f15de11dbd052182dc2ead6aba0a602 (diff)
Correct code style
--HG-- branch : beta
Diffstat (limited to 'rhodecode/model/user.py')
-rw-r--r--rhodecode/model/user.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py
index da3db5c2..f81a89c0 100644
--- a/rhodecode/model/user.py
+++ b/rhodecode/model/user.py
@@ -49,14 +49,14 @@ PERM_WEIGHTS = {'repository.none': 0,
class UserModel(BaseModel):
- def get(self, user_id, cache=False):
+ def get(self, user_id, cache = False):
user = self.sa.query(User)
if cache:
user = user.options(FromCache("sql_cache_short",
"get_user_%s" % user_id))
return user.get(user_id)
- def get_by_username(self, username, cache=False, case_insensitive=False):
+ def get_by_username(self, username, cache = False, case_insensitive = False):
if case_insensitive:
user = self.sa.query(User).filter(User.username.ilike(username))
@@ -68,7 +68,7 @@ class UserModel(BaseModel):
"get_user_%s" % username))
return user.scalar()
- def get_by_api_key(self, api_key, cache=False):
+ def get_by_api_key(self, api_key, cache = False):
user = self.sa.query(User)\
.filter(User.api_key == api_key)
@@ -103,7 +103,7 @@ class UserModel(BaseModel):
"""
from rhodecode.lib.auth import get_crypt_password
log.debug('Checking for such ldap account in RhodeCode database')
- if self.get_by_username(username, case_insensitive=True) is None:
+ if self.get_by_username(username, case_insensitive = True) is None:
try:
new_user = User()
# add ldap account always lowercase
@@ -152,7 +152,7 @@ class UserModel(BaseModel):
def update(self, user_id, form_data):
try:
- user = self.get(user_id, cache=False)
+ user = self.get(user_id, cache = False)
if user.username == 'default':
raise DefaultUserException(
_("You can't Edit this user since it's"
@@ -174,7 +174,7 @@ class UserModel(BaseModel):
def update_my_account(self, user_id, form_data):
try:
- user = self.get(user_id, cache=False)
+ user = self.get(user_id, cache = False)
if user.username == 'default':
raise DefaultUserException(
_("You can't Edit this user since it's"
@@ -196,7 +196,7 @@ class UserModel(BaseModel):
def delete(self, user_id):
try:
- user = self.get(user_id, cache=False)
+ user = self.get(user_id, cache = False)
if user.username == 'default':
raise DefaultUserException(
_("You can't remove this user since it's"
@@ -222,7 +222,7 @@ class UserModel(BaseModel):
from rhodecode.lib.celerylib import tasks, run_task
run_task(tasks.reset_user_password, data['email'])
- def fill_data(self, auth_user, user_id=None, api_key=None):
+ def fill_data(self, auth_user, user_id = None, api_key = None):
"""
Fetches auth_user by user_id,or api_key if present.
Fills auth_user attributes with those taken from database.
@@ -268,7 +268,7 @@ class UserModel(BaseModel):
#======================================================================
# fetch default permissions
#======================================================================
- default_user = self.get_by_username('default', cache=True)
+ default_user = self.get_by_username('default', cache = True)
default_perms = self.sa.query(RepoToPerm, Repository, Permission)\
.join((Repository, RepoToPerm.repository_id ==