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

config: decode id to unicode

Browse source
This commit is contained in:
Justin Findlay 2016-01-27 09:39:57 -07:00
parent 1c6c394d0e
commit 7a16f1c941
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/config.py
View file

@ -38,6 +38,7 @@ import salt.utils.validate.path
import salt.utils.xdg
import salt.exceptions
import salt.utils.sdb
from salt.utils.locales import sdecode
log = logging.getLogger(__name__)
@ -1411,7 +1412,10 @@ def _read_conf_file(path):
conf_opts = {}
# allow using numeric ids: convert int to string
if 'id' in conf_opts:
conf_opts['id'] = str(conf_opts['id'])
if not isinstance(conf_opts['id'], six.string_types):
conf_opts['id'] = str(conf_opts['id'])
else:
conf_opts['id'] = sdecode(conf_opts['id'])
for key, value in six.iteritems(conf_opts.copy()):
if isinstance(value, text_type) and six.PY2:
# We do not want unicode settings