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

Merge pull request #39228 from gtmanfred/2016.3

Browse source 
default to utf8 encoding if not specified
This commit is contained in:
Mike Place 2017-02-08 12:36:57 -07:00 • committed by GitHub
commit bc89b297f8
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/utils/aws.py
View file

@ -87,7 +87,7 @@ def creds(provider):
proxies={'http': ''}, timeout=AWS_METADATA_TIMEOUT,
)
result.raise_for_status()
role = result.text.encode(result.encoding)
role = result.text.encode(result.encoding or 'utf-8')
except (requests.exceptions.HTTPError, requests.exceptions.ConnectionError):
return provider['id'], provider['key'], ''
@ -460,7 +460,7 @@ def query(params=None, setname=None, requesturl=None, location=None,
)
LOG.trace(
'AWS Response Text: {0}'.format(
result.text.encode(result.encoding)
result.text.encode(result.encoding or 'utf-8')
)
)
result.raise_for_status()
@ -501,7 +501,7 @@ def query(params=None, setname=None, requesturl=None, location=None,
return {'error': data}, requesturl
return {'error': data}
response = result.text.encode(result.encoding)
response = result.text.encode(result.encoding or 'utf-8')
root = ET.fromstring(response)
items = root[1]