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

Only try latin-1 from get_diff instead of by default

Browse source
This commit is contained in:
Erik Johnson 2018-08-06 15:31:21 -05:00
parent d39fa889f3
commit e2d19f40b6
No known key found for this signature in database
GPG key ID: 5E5583C437808F3F
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
salt/utils/stringutils.py
View file

@ -33,8 +33,8 @@ def to_bytes(s, encoding=None, errors='strict'):
python 2)
'''
if encoding is None:
# Try utf-8 first, then latin-1, and fall back to detected encoding
encoding = ('utf-8', 'latin-1', __salt_system_encoding__)
# Try utf-8 first, and fall back to detected encoding
encoding = ('utf-8', __salt_system_encoding__)
if not isinstance(encoding, (tuple, list)):
encoding = (encoding,)
@ -74,8 +74,8 @@ def to_str(s, encoding=None, errors='strict', normalize=False):
return s
if encoding is None:
# Try utf-8 first, then latin-1, and fall back to detected encoding
encoding = ('utf-8', 'latin-1', __salt_system_encoding__)
# Try utf-8 first, and fall back to detected encoding
encoding = ('utf-8', __salt_system_encoding__)
if not isinstance(encoding, (tuple, list)):
encoding = (encoding,)
@ -126,8 +126,8 @@ def to_unicode(s, encoding=None, errors='strict', normalize=False):
return unicodedata.normalize('NFC', s) if normalize else s
if encoding is None:
# Try utf-8 first, then latin-1, and fall back to detected encoding
encoding = ('utf-8', 'latin-1', __salt_system_encoding__)
# Try utf-8 first, and fall back to detected encoding
encoding = ('utf-8', __salt_system_encoding__)
if not isinstance(encoding, (tuple, list)):
encoding = (encoding,)
@ -557,12 +557,13 @@ def get_diff(a, b, *args, **kwargs):
the diff as as string. Lines are normalized to str types to avoid issues
with unicode on PY2.
'''
encoding = ('utf-8', 'latin-1', __salt_system_encoding__)
# Late import to avoid circular import
import salt.utils.data
return ''.join(
difflib.unified_diff(
salt.utils.data.decode_list(a),
salt.utils.data.decode_list(b),
salt.utils.data.decode_list(a, encoding=encoding),
salt.utils.data.decode_list(b, encoding=encoding),
*args, **kwargs
)
)