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

[cloud] Python3 fixes: use string_types instead of basestring (#26102)

Browse source 
Don't modify a dict while iterating over it
This commit is contained in:
Sloane Hertel 2017-06-26 15:06:53 -04:00 committed by Ryan Brown
parent e56ea435f0
commit dc2d9a2134
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/modules/cloud/amazon/elb_application_lb.py
View file

@ -334,6 +334,7 @@ vpc_id:
'''
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.six import string_types
from ansible.module_utils.ec2 import boto3_conn, get_aws_connection_info, camel_dict_to_snake_dict, ec2_argument_spec, get_ec2_security_group_ids_from_names, \
ansible_dict_to_boto3_tag_list, boto3_tag_list_to_ansible_dict, compare_aws_tags, HAS_BOTO3
import collections
@ -348,7 +349,7 @@ except ImportError:
def convert(data):
if isinstance(data, basestring):
if isinstance(data, string_types):
return str(data)
elif isinstance(data, collections.Mapping):
return dict(map(convert, data.items()))
@ -427,7 +428,7 @@ def get_elb_attributes(connection, module, elb_arn):
module.fail_json(msg=e.message, exception=traceback.format_exc(), **camel_dict_to_snake_dict(e.response))
# Replace '.' with '_' in attribute key names to make it more Ansibley
for k, v in elb_attributes.items():
for k, v in dict(elb_attributes).items():
elb_attributes[k.replace('.', '_')] = v
del elb_attributes[k]