Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed py33 errors.

Browse Source
This commit is contained in:
Rory-Finnegan 2014-09-03 19:52:23 -04:00
parent bf996f1461
commit c2dd4a7ee4
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moto/ec2/models.py
View File

@ -559,7 +559,7 @@ class SecurityGroup(object):
return attr return attr
for key, value in filters.iteritems(): for key, value in filters.items():
ret = False ret = False
if key.startswith('ip-permission'): if key.startswith('ip-permission'):

4
moto/ec2/responses/security_groups.py
View File

@ -38,7 +38,7 @@ def process_rules_from_querystring(querystring):
def process_group_ids_from_querystring(querystring): def process_group_ids_from_querystring(querystring):
group_ids = [] group_ids = []
for key, value in querystring.iteritems(): for key, value in querystring.items():
if 'GroupId' in key: if 'GroupId' in key:
group_ids.append(value[0]) group_ids.append(value[0])
return group_ids return group_ids
@ -46,7 +46,7 @@ def process_group_ids_from_querystring(querystring):
def process_groupnames_from_querystring(querystring): def process_groupnames_from_querystring(querystring):
groupnames = [] groupnames = []
for key, value in querystring.iteritems(): for key, value in querystring.items():
if 'GroupName' in key: if 'GroupName' in key:
groupnames.append(value[0]) groupnames.append(value[0])
return groupnames return groupnames

4
moto/iam/utils.py
View File

@ -5,7 +5,7 @@ import six
def random_alhpnumeric(length): def random_alhpnumeric(length):
return ''.join(unicode( return ''.join(six.text_type(
random.choice( random.choice(
string.ascii_letters + string.digits string.ascii_letters + string.digits
)) for _ in range(length) )) for _ in range(length)
@ -20,7 +20,7 @@ def random_resource_id():
def random_access_key(): def random_access_key():
return ''.join(unicode( return ''.join(six.text_type(
random.choice( random.choice(
string.ascii_uppercase + string.digits string.ascii_uppercase + string.digits
)) for _ in range(16) )) for _ in range(16)