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

#531 correction

Browse source 
correct list comprehension for older versions of python (back to python 2.4)
This commit is contained in:
Kale Franz 2014-12-17 09:01:50 -08:00
parent e174c9b474
commit 73172fae47
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cloud/amazon/ec2_group.py
View file

@ -117,9 +117,9 @@ except ImportError:
def make_rule_key(prefix, rule, group_id, cidr_ip):
"""Creates a unique key for an individual group rule"""
if isinstance(rule, dict):
proto, from_port, to_port = (rule.get(x, None) for x in ('proto', 'from_port', 'to_port'))
proto, from_port, to_port = [rule.get(x, None) for x in ('proto', 'from_port', 'to_port')]
else: # isinstance boto.ec2.securitygroup.IPPermissions
proto, from_port, to_port = (getattr(rule, x, None) for x in ('ip_protocol', 'from_port', 'to_port'))
proto, from_port, to_port = [getattr(rule, x, None) for x in ('ip_protocol', 'from_port', 'to_port')]
key = "%s-%s-%s-%s-%s-%s" % (prefix, proto, from_port, to_port, group_id, cidr_ip)
return key.lower().replace('-none', '-None')