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

Convert data to string using salt util #51534

Merged
merged 1 commit into from Feb 7, 2019

Conversation

@twangboy
Copy link
Contributor

commented Feb 6, 2019

What does this PR do?

Fixes issue in Py3 on Windows where the filebuffer is trying to decode something that's already a string.

This PR will use the salt util to convert to string which handles those cases nicely.

What issues does this PR fix or reference?

#51309

An optional fix is to open the filebuffer using 'rb' mode. I went with this approach...

Tests written?

No

Commits signed with GPG?

Yes

@dwoz
dwoz approved these changes Feb 7, 2019
@Ch3LL Ch3LL merged commit c37bdb7 into saltstack:2018.3.4 Feb 7, 2019
8 of 10 checks passed
8 of 10 checks passed
continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
WIP Ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint Python lint test has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 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
@twangboy twangboy deleted the twangboy:fix_51309 branch Feb 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.