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

Fix minor issues with #42572

Browse Source 
See https://github.com/saltstack/salt/pull/42572#pullrequestreview-55270580
This commit is contained in:
Erik Johnson 2017-08-09 15:55:52 -05:00
parent 333d86d96c
commit 59e19a9c15
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/client/ssh/wrapper/grains.py
View File

@ -24,7 +24,9 @@ __grains__ = {}
def _serial_sanitizer(instr): def _serial_sanitizer(instr):
u'''Replaces the last 1/4 of a string with X's''' '''
Replaces the last 1/4 of a string with X's
'''
length = len(instr) length = len(instr)
index = int(math.floor(length * .75)) index = int(math.floor(length * .75))
return u'{0}{1}'.format(instr[:index], u'X' * (length - index)) return u'{0}{1}'.format(instr[:index], u'X' * (length - index))

3
salt/minion.py
View File

@ -86,7 +86,6 @@ import salt.payload
import salt.pillar import salt.pillar
import salt.syspaths import salt.syspaths
import salt.utils import salt.utils
import salt.pillar
import salt.utils.args import salt.utils.args
import salt.utils.context import salt.utils.context
import salt.utils.error import salt.utils.error
@ -319,7 +318,7 @@ def load_args_and_kwargs(func, args, data=None, ignore_invalid=False):
# list of positional arguments. This keyword argument is # list of positional arguments. This keyword argument is
# invalid. # invalid.
for key, val in six.iteritems(string_kwarg): for key, val in six.iteritems(string_kwarg):
invalid_kwargs.append(r'{0}={1}'.format(key, val)) invalid_kwargs.append(u'{0}={1}'.format(key, val))
else: else:
_args.append(arg) _args.append(arg)