# HG changeset patch # User domruf # Date 1447695233 -3600 # Node ID df619c4f0b557574b6b73fc24148335154519d99 # Parent ed2fb6e84a02b9a74596c38e58959f57aefc017a api: minor cleanups diff -r ed2fb6e84a02 -r df619c4f0b55 kallithea/controllers/api/api.py --- a/kallithea/controllers/api/api.py Mon Nov 16 18:33:53 2015 +0100 +++ b/kallithea/controllers/api/api.py Mon Nov 16 18:33:53 2015 +0100 @@ -25,7 +25,6 @@ :license: GPLv3, see LICENSE.md for more details. """ - import time import traceback import logging @@ -705,10 +704,10 @@ @HasPermissionAllDecorator('hg.admin') def update_user(self, apiuser, userid, username=Optional(None), - email=Optional(None),password=Optional(None), + email=Optional(None), password=Optional(None), firstname=Optional(None), lastname=Optional(None), active=Optional(None), admin=Optional(None), - extern_type=Optional(None), extern_name=Optional(None),): + extern_type=Optional(None), extern_name=Optional(None)): """ updates given user if such user exists. This command can be executed only using api_key belonging to user with admin rights. @@ -1074,7 +1073,7 @@ raise JSONRPCError('failed to delete user group ID:%s %s' % (user_group.users_group_id, user_group.users_group_name) - ) + ) # permission check inside def add_user_to_user_group(self, apiuser, usergroupid, userid): @@ -1455,7 +1454,7 @@ """ if not HasPermissionAnyApi('hg.admin')(user=apiuser): if not isinstance(owner, Optional): - #forbid setting owner for non-admins + # forbid setting owner for non-admins raise JSONRPCError( 'Only Kallithea admin can specify `owner` param' ) @@ -1562,7 +1561,7 @@ raise JSONRPCError('no permission to create (or move) repositories') if not isinstance(owner, Optional): - #forbid setting owner for non-admins + # forbid setting owner for non-admins raise JSONRPCError( 'Only Kallithea admin can specify `owner` param' ) @@ -1660,7 +1659,7 @@ 'repository.read')(user=apiuser, repo_name=repo.repo_name): if not isinstance(owner, Optional): - #forbid setting owner for non-admins + # forbid setting owner for non-admins raise JSONRPCError( 'Only Kallithea admin can specify `owner` param' ) @@ -1741,7 +1740,7 @@ if not HasPermissionAnyApi('hg.admin')(user=apiuser): # check if we have admin permission for this repo ! if not HasRepoPermissionAnyApi('repository.admin')(user=apiuser, - repo_name=repo.repo_name): + repo_name=repo.repo_name): raise JSONRPCError('repository `%s` does not exist' % (repoid,)) try: @@ -2175,7 +2174,7 @@ log.error(traceback.format_exc()) raise JSONRPCError('failed to delete repo group ID:%s %s' % (repo_group.group_id, repo_group.group_name) - ) + ) # permission check inside def grant_user_permission_to_repo_group(self, apiuser, repogroupid, userid, @@ -2315,7 +2314,7 @@ # permission check inside def grant_user_group_permission_to_repo_group( self, apiuser, repogroupid, usergroupid, perm, - apply_to_children=Optional('none'),): + apply_to_children=Optional('none')): """ Grant permission for user group on given repository group, or update existing one if found. This command can be executed only using @@ -2381,9 +2380,9 @@ Session().commit() return dict( msg='Granted perm: `%s` (recursive:%s) for user group: `%s` in repo group: `%s`' % ( - perm.permission_name, apply_to_children, - user_group.users_group_name, repo_group.name - ), + perm.permission_name, apply_to_children, + user_group.users_group_name, repo_group.name + ), success=True ) except Exception: