Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure that we don't feed jinja2.Markup() a str type #49125

Merged
merged 2 commits into from Aug 15, 2018

Conversation

Projects
None yet
2 participants
@terminalmage
Copy link
Contributor

commented Aug 14, 2018

If the dumped contents contain non-ascii unicode, this will cause a UnicodeDecodeError.

Fixes #49100.

terminalmage added some commits Aug 14, 2018

Ensure that we don't feed jinja2.Markup() a str type
If the dumped contents contain non-ascii unicode, this will cause a
UnicodeDecodeError.

@cachedout cachedout merged commit 21435be into saltstack:2018.3 Aug 15, 2018

6 of 8 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has failed
Details
WIP ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details

@terminalmage terminalmage deleted the terminalmage:issue49100 branch Aug 15, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.