valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pylint fixes

Browse Source
This commit is contained in:
Jeremy Rosenbaum 2015-04-18 22:42:13 -07:00
parent 656a8d1339
commit b74b2dde60
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/modules/splay.py
View File

@ -43,7 +43,7 @@ def splay(*args, **kwargs):
NOTE: You *probably* want to use --async here and look up the job results later. NOTE: You *probably* want to use --async here and look up the job results later.
If you're dead set on getting the output from the CLI command, then make If you're dead set on getting the output from the CLI command, then make
sure to set the timeout (with the -t flag) to something greater than the sure to set the timeout (with the -t flag) to something greater than the
splaytime (max splaytime + time to execute job). splaytime (max splaytime + time to execute job).
Otherwise, it's very likely that the cli will time out before the job returns. Otherwise, it's very likely that the cli will time out before the job returns.
@ -69,13 +69,13 @@ def splay(*args, **kwargs):
func = args.pop(0) func = args.pop(0)
# Check if the func is valid before the sleep # Check if the func is valid before the sleep
if not func in __salt__: if func not in __salt__:
raise CommandExecutionError('Unable to find module function {0}'.format(func)) raise CommandExecutionError('Unable to find module function {0}'.format(func))
my_delay = _calc_splay(__grains__['id'], splaytime=splaytime) my_delay = _calc_splay(__grains__['id'], splaytime=splaytime)
time.sleep(my_delay) time.sleep(my_delay)
# Get rid of the hidden kwargs that salt injects # Get rid of the hidden kwargs that salt injects
func_kwargs = dict((k,v) for k,v in kwargs.iteritems() if not k.startswith('__')) func_kwargs = dict((k, v) for k, v in kwargs.iteritems() if not k.startswith('__'))
result = __salt__[func](*args, **func_kwargs) result = __salt__[func](*args, **func_kwargs)
if type(result) != dict: if type(result) != dict:
result = {'result': result} result = {'result': result}