saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Simplify client logic

Browse source
This commit is contained in:
Erik Johnson 2017-09-06 10:38:45 -05:00 • committed by rallytime
parent b5f10696c2
commit 7abd07fa07
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
salt/client/mixins.py
View file

@ -360,19 +360,18 @@ class SyncClientMixin(object):
# that since the caller knows what is an arg vs a kwarg, but while
# we make the transition we will load "kwargs" using format_call if
# there are no kwargs in the low object passed in.
f_call = {} if 'arg' in low and 'kwarg' in low \
else salt.utils.format_call(
if 'arg' in low and 'kwarg' in low:
args = low['arg']
kwargs = low['kwarg']
else:
f_call = salt.utils.format_call(
self.functions[fun],
low,
expected_extra_kws=CLIENT_INTERNAL_KEYWORDS
)
args = f_call.get('args', ()) \
if 'arg' not in low \
else low['arg']
kwargs = f_call.get('kwargs', {}) \
if 'kwarg' not in low \
else low['kwarg']
args = f_call.get('args', ())
kwargs = f_call.get('kwargs', {})
# Update the event data with loaded args and kwargs
data['fun_args'] = list(args) + ([kwargs] if kwargs else [])