cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[cloud] unicode is absent on Python 3, use text_type (#20861)

Browse source
This commit is contained in:
Eugene Krokhalev 2017-01-31 19:17:04 +04:00 committed by Ryan S. Brown
parent 3551de98c6
commit 4e257fad84
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/module_utils/ec2.py
View file

@ -52,7 +52,7 @@ try:
except:
HAS_LOOSE_VERSION = False
from ansible.module_utils.six import string_types
from ansible.module_utils.six import string_types, binary_type, text_type
class AnsibleAWSError(Exception):
pass
@ -232,8 +232,8 @@ def get_aws_connection_info(module, boto3=False):
boto_params['validate_certs'] = validate_certs
for param, value in boto_params.items():
if isinstance(value, str):
boto_params[param] = unicode(value, 'utf-8', 'strict')
if isinstance(value, binary_type):
boto_params[param] = text_type(value, 'utf-8', 'strict')
return region, ec2_url, boto_params