catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Support Python 3 using six

Browse source
This commit is contained in:
David Baumgold 2014-08-26 13:25:50 -04:00
commit eedb4c4b73
67 changed files with 455 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

6
moto/autoscaling/models.py
View file

@ -243,7 +243,7 @@ class AutoScalingBackend(BaseBackend):
if names:
return [configuration for configuration in configurations if configuration.name in names]
else:
return configurations
return list(configurations)
def delete_launch_configuration(self, launch_configuration_name):
self.launch_configurations.pop(launch_configuration_name, None)
@ -300,7 +300,7 @@ class AutoScalingBackend(BaseBackend):
if names:
return [group for group in groups if group.name in names]
else:
return groups
return list(groups)
def delete_autoscaling_group(self, group_name):
self.autoscaling_groups.pop(group_name, None)
@ -345,7 +345,7 @@ class AutoScalingBackend(BaseBackend):
return policy
def describe_policies(self):
return self.policies.values()
return list(self.policies.values())
def delete_policy(self, group_name):
self.policies.pop(group_name, None)

2
moto/autoscaling/responses.py
View file

@ -191,7 +191,7 @@ DESCRIBE_LAUNCH_CONFIGURATIONS_TEMPLATE = """<DescribeLaunchConfigurationsRespon
9dbbbf87-6141-428a-a409-0752edbe6cad:launchConfigurationName/my-test-lc</LaunchConfigurationARN>
{% if launch_configuration.block_device_mappings %}
<BlockDeviceMappings>
{% for mount_point, mapping in launch_configuration.block_device_mappings.iteritems() %}
{% for mount_point, mapping in launch_configuration.block_device_mappings.items() %}
<member>
<DeviceName>{{ mount_point }}</DeviceName>
{% if mapping.ephemeral_name %}