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.

Sign up for GitHub

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

Jump to bottom

Fix issue 49043 #49782

Merged
merged 3 commits into from
Oct 1, 2018
Merged

Fix issue 49043 #49782

merged 3 commits into from
Oct 1, 2018

Conversation

dwoz
Copy link
Contributor

@dwoz dwoz commented Sep 26, 2018

What does this PR do?

  • Detect utf-8 before ascii in get_encoding method.
  • Default to os.linesep in diff output from get_diff method.
  • Fix template render out encoding on windows platform.

What issues does this PR fix or reference?

#49043

Previous Behavior

  • Exception raised by get_encoding method when given utf-8

New Behavior

  • Blockreplace succeeds as expected.

Tests written?

Yes

Commits signed with GPG?

Yes

@dwoz dwoz closed this Sep 26, 2018
@dwoz dwoz reopened this Sep 26, 2018
@dwoz dwoz changed the title [WIP] Fix issue 49043 Fix issue 49043 Sep 29, 2018
@rallytime rallytime mentioned this pull request Oct 1, 2018
Closed
@rallytime rallytime merged commit aca87ab into saltstack:2018.3 Oct 1, 2018
@byteskeptical byteskeptical mentioned this pull request Oct 25, 2018
Closed
@Ch3LL Ch3LL mentioned this pull request Dec 5, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@terminalmage terminalmage terminalmage approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dwoz @terminalmage @rallytime