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

Handle non-ASCII chars during template data decode

Browse source 
Change requested by terminalmage, line 255.
This commit is contained in:
Gabriel 2018-10-10 12:13:04 -04:00 • committed by rallytime
parent 435afb76ad
commit d336decde7
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/pillar/file_tree.py
View file

@ -252,7 +252,7 @@ def _construct_pillar(top_dir,
else:
data = contents
if template is True:
data = salt.template.compile_template_str(template=salt.utils.stringutils.to_str(contents),
data = salt.template.compile_template_str(template=salt.utils.stringutils.to_unicode(contents),
renderers=renderers,
default=render_default,
blacklist=renderer_blacklist,