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

Merge remote-tracking branch 'dw/win_locales_utf8' into win_locales_utf8

Browse source
This commit is contained in:
twangboy 2018-03-23 09:47:28 -06:00
commit a0ab27ef15
No known key found for this signature in database
GPG key ID: 93FF3BDEB278C9EB
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
salt/utils/templates.py
View file

@ -288,7 +288,7 @@ def _get_jinja_error(trace, context=None):
return line, out
def render_jinja_tmpl(tmplstr, context, tmplpath=None, encoding=None):
def render_jinja_tmpl(tmplstr, context, tmplpath=None, encoding=SLS_ENCODING):
opts = context['opts']
saltenv = context['saltenv']
loader = None
@ -296,7 +296,7 @@ def render_jinja_tmpl(tmplstr, context, tmplpath=None, encoding=None):
if tmplstr and not isinstance(tmplstr, six.text_type):
# http://jinja.pocoo.org/docs/api/#unicode
tmplstr = tmplstr.decode(SLS_ENCODING)
tmplstr = tmplstr.decode(encoding)
if tmplstr.endswith(os.linesep):
newline = True
@ -410,7 +410,14 @@ def render_jinja_tmpl(tmplstr, context, tmplpath=None, encoding=None):
decoded_context[key] = value
continue
decoded_context[key] = salt.utils.to_unicode(value, encoding=encoding)
try:
decoded_context[key] = salt.utils.to_unicode(value, encoding=encoding)
except UnicodeDecodeError as ex:
log.debug(
"Failed to decode using default encoding (%s), trying system encoding",
encoding,
)
decoded_context[key] = salt.utils.locales.sdecode(value)
try:
template = jinja_env.from_string(tmplstr)