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

Merge pull request #46432 from twangboy/win_locales_utf8

Browse Source 
Default to UTF-8 for templated files
This commit is contained in:
Nicole Thomas 2018-03-26 15:02:13 -04:00 committed by GitHub
commit ac2a6616a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
salt/utils/templates.py
View File

@ -410,7 +410,14 @@ def render_jinja_tmpl(tmplstr, context, tmplpath=None):
decoded_context[key] = value
continue
decoded_context[key] = salt.utils.locales.sdecode(value)
try:
decoded_context[key] = salt.utils.to_unicode(value, encoding=SLS_ENCODING)
except UnicodeDecodeError as ex:
log.debug(
"Failed to decode using default encoding (%s), trying system encoding",
SLS_ENCODING,
)
decoded_context[key] = salt.utils.locales.sdecode(value)
try:
template = jinja_env.from_string(tmplstr)