From 2ee2c8c1ab5ec00e811af806b439b80352f6447a Mon Sep 17 00:00:00 2001 From: Silvio Tomatis Date: Fri, 2 Jun 2017 13:40:56 +0200 Subject: [PATCH] [cloud] ec2_elb_lb module Python 3 fix for string types (#24925) * Python 3 compatibility for ec2_elb_lb module * Use string_types from ansible.module_utils.six for python2/3 compatibility --- lib/ansible/modules/cloud/amazon/ec2_elb_lb.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/ansible/modules/cloud/amazon/ec2_elb_lb.py b/lib/ansible/modules/cloud/amazon/ec2_elb_lb.py index 03cc12322c..cf5991f303 100644 --- a/lib/ansible/modules/cloud/amazon/ec2_elb_lb.py +++ b/lib/ansible/modules/cloud/amazon/ec2_elb_lb.py @@ -412,6 +412,7 @@ import random from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ec2 import ec2_argument_spec, connect_to_aws, AnsibleAWSError from ansible.module_utils.ec2 import get_aws_connection_info +from ansible.module_utils.six import string_types def _throttleable_operation(max_retries): @@ -1332,7 +1333,7 @@ def main(): grp_details = ec2.get_all_security_groups(filters=filters) for group_name in security_group_names: - if isinstance(group_name, basestring): + if isinstance(group_name, string_types): group_name = [group_name] group_id = [ str(grp.id) for grp in grp_details if str(grp.name) in group_name ]