Properly handle latin-1 encoding in file diffs #48934
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also allow for multiple encodings to be passed
In PY3 the caught exceptions now drop out of scope when leaving the for loop.
rallytime
reviewed
Aug 5, 2018
salt/modules/file.py
Outdated
| @@ -1567,7 +1567,7 @@ def comment_line(path, | |||
| check_perms(path, None, pre_user, pre_group, pre_mode) | |||
|
|
|||
| # Return a diff using the two dictionaries | |||
| return ''.join(difflib.unified_diff(orig_file, new_file)) | |||
| return __salt__['stringutils.get_diff'](orig_file, new_file) | |||
There was a problem hiding this comment.
Should this be __utils__ instead of __salt__?
salt/modules/file.py
Outdated
| changes_diff = ''.join(difflib.unified_diff( | ||
| path_content, body | ||
| )) | ||
| changes_diff = __salt__['stringutils.get_diff'](path_content, body) |
There was a problem hiding this comment.
Same question here as above.
salt/modules/file.py
Outdated
| @@ -2688,7 +2683,7 @@ def _add_content(linesep, lines=None, include_marker_start=True, | |||
| ) | |||
|
|
|||
| if block_found: | |||
| diff = ''.join(difflib.unified_diff(orig_file, new_file)) | |||
| diff = __salt__['stringutils.get_diff'](orig_file, new_file) | |||
rallytime
approved these changes
Aug 6, 2018
damon-atkins
approved these changes
Aug 6, 2018
|
@terminalmage This looks like the tests will need some mocking love, due to the change to |
|
@terminalmage Looks like one last test failure to clean up here https://jenkinsci.saltstack.com/job/pr-kitchen-ubuntu1604-py3/job/PR-48934/4/ |
Since latin-1 is not being automatically decoded, we need to explicitly pass it on the test.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This changes the encoding/decoding helpers to attempt latin-1 after initially trying UTF-8, which prevents a traceback when displaying diffs when a file with latin-1 encoding is updated using a file.managed state.
Resolves #48777