diff --git a/moto/ec2/models.py b/moto/ec2/models.py index 4c31a1431..540d98744 100644 --- a/moto/ec2/models.py +++ b/moto/ec2/models.py @@ -559,7 +559,7 @@ class SecurityGroup(object): return attr - for key, value in filters.iteritems(): + for key, value in filters.items(): ret = False if key.startswith('ip-permission'): diff --git a/moto/ec2/responses/security_groups.py b/moto/ec2/responses/security_groups.py index a12caec41..37d9bf35d 100644 --- a/moto/ec2/responses/security_groups.py +++ b/moto/ec2/responses/security_groups.py @@ -38,7 +38,7 @@ def process_rules_from_querystring(querystring): def process_group_ids_from_querystring(querystring): group_ids = [] - for key, value in querystring.iteritems(): + for key, value in querystring.items(): if 'GroupId' in key: group_ids.append(value[0]) return group_ids @@ -46,7 +46,7 @@ def process_group_ids_from_querystring(querystring): def process_groupnames_from_querystring(querystring): groupnames = [] - for key, value in querystring.iteritems(): + for key, value in querystring.items(): if 'GroupName' in key: groupnames.append(value[0]) return groupnames diff --git a/moto/iam/utils.py b/moto/iam/utils.py index 671de8f47..db3835210 100644 --- a/moto/iam/utils.py +++ b/moto/iam/utils.py @@ -5,7 +5,7 @@ import six def random_alhpnumeric(length): - return ''.join(unicode( + return ''.join(six.text_type( random.choice( string.ascii_letters + string.digits )) for _ in range(length) @@ -20,7 +20,7 @@ def random_resource_id(): def random_access_key(): - return ''.join(unicode( + return ''.join(six.text_type( random.choice( string.ascii_uppercase + string.digits )) for _ in range(16)