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

PY3 scoping fix

Browse source 
In PY3 the caught exceptions now drop out of scope when leaving the for
loop.
This commit is contained in:
Erik Johnson 2018-08-03 18:36:01 -05:00
parent 726dd4331f
commit 906644a80f
No known key found for this signature in database
GPG key ID: 5E5583C437808F3F
1 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
salt/utils/stringutils.py
View file

@ -38,6 +38,10 @@ def to_bytes(s, encoding=None, errors='strict'):
if not isinstance(encoding, (tuple, list)):
encoding = (encoding,)
if not encoding:
raise ValueError('encoding cannot be empty')
exc = None
if six.PY3:
if isinstance(s, bytes):
return s
@ -48,12 +52,12 @@ def to_bytes(s, encoding=None, errors='strict'):
try:
return s.encode(enc, errors)
except UnicodeEncodeError as err:
exc = err
continue
# The only way we get this far is if a UnicodeEncodeError was
# raised, otherwise we would have already returned (or raised some
# other exception). So this should not result in an
# UnboundLocalError.
raise err
# other exception).
raise exc
raise TypeError('expected bytes, bytearray, or str')
else:
return to_str(s, encoding, errors)
@ -75,22 +79,27 @@ def to_str(s, encoding=None, errors='strict', normalize=False):
if not isinstance(encoding, (tuple, list)):
encoding = (encoding,)
if not encoding:
raise ValueError('encoding cannot be empty')
# This shouldn't be six.string_types because if we're on PY2 and we already
# have a string, we should just return it.
if isinstance(s, str):
return _normalize(s)
exc = None
if six.PY3:
if isinstance(s, (bytes, bytearray)):
for enc in encoding:
try:
return _normalize(s.decode(enc, errors))
except UnicodeDecodeError as err:
exc = err
continue
# The only way we get this far is if a UnicodeDecodeError was
# raised, otherwise we would have already returned (or raised some
# other exception). So this should not result in an
# UnboundLocalError.
raise err
# other exception).
raise exc
raise TypeError('expected str, bytes, or bytearray not {}'.format(type(s)))
else:
if isinstance(s, bytearray):
@ -100,12 +109,12 @@ def to_str(s, encoding=None, errors='strict', normalize=False):
try:
return _normalize(s).encode(enc, errors)
except UnicodeEncodeError as err:
exc = err
continue
# The only way we get this far is if a UnicodeDecodeError was
# raised, otherwise we would have already returned (or raised some
# other exception). So this should not result in an
# UnboundLocalError.
raise err
# other exception).
raise exc
raise TypeError('expected str, bytearray, or unicode')
@ -122,6 +131,10 @@ def to_unicode(s, encoding=None, errors='strict', normalize=False):
if not isinstance(encoding, (tuple, list)):
encoding = (encoding,)
if not encoding:
raise ValueError('encoding cannot be empty')
exc = None
if six.PY3:
if isinstance(s, str):
return _normalize(s)
@ -139,12 +152,12 @@ def to_unicode(s, encoding=None, errors='strict', normalize=False):
try:
return _normalize(s.decode(enc, errors))
except UnicodeDecodeError as err:
exc = err
continue
# The only way we get this far is if a UnicodeDecodeError was
# raised, otherwise we would have already returned (or raised some
# other exception). So this should not result in an
# UnboundLocalError.
raise err
# other exception).
raise exc
raise TypeError('expected str or bytearray')