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

Keeping support to python 2

Browse Source
This commit is contained in:
addomafi 2020-03-07 07:43:59 -03:00
parent c6eca18434
commit 155cf82791
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
moto/emr/responses.py
View File

@ -363,7 +363,7 @@ class ElasticMapReduceResponse(BaseResponse):
iops = "iops" iops = "iops"
volumes_per_instance = "volumes_per_instance" volumes_per_instance = "volumes_per_instance"
key_ebs_optimized = f"{key_ebs_config}._{ebs_optimized}" key_ebs_optimized = "{0}._{1}".format(key_ebs_config, ebs_optimized)
# EbsOptimized config # EbsOptimized config
if key_ebs_optimized in ebs_configuration: if key_ebs_optimized in ebs_configuration:
instance_group.pop(key_ebs_optimized) instance_group.pop(key_ebs_optimized)
@ -374,10 +374,10 @@ class ElasticMapReduceResponse(BaseResponse):
# Ebs Blocks # Ebs Blocks
ebs_blocks = [] ebs_blocks = []
idx = 1 idx = 1
keyfmt = f"{key_ebs_config}._{ebs_block_device_configs}.member.{{}}" keyfmt = "{0}._{1}.member.{{}}".format(key_ebs_config, ebs_block_device_configs)
key = keyfmt.format(idx) key = keyfmt.format(idx)
while self._has_key_prefix(key, ebs_configuration): while self._has_key_prefix(key, ebs_configuration):
vlespc_keyfmt = f"{key}._{volume_specification}._{{}}" vlespc_keyfmt = "{0}._{1}._{{}}".format(key, volume_specification)
vol_size = vlespc_keyfmt.format(size_in_gb) vol_size = vlespc_keyfmt.format(size_in_gb)
vol_iops = vlespc_keyfmt.format(iops) vol_iops = vlespc_keyfmt.format(iops)
vol_type = vlespc_keyfmt.format(volume_type) vol_type = vlespc_keyfmt.format(volume_type)
@ -400,7 +400,7 @@ class ElasticMapReduceResponse(BaseResponse):
volume_type volume_type
] = ebs_configuration.pop(vol_type) ] = ebs_configuration.pop(vol_type)
per_instance = f"{key}._{volumes_per_instance}" per_instance = "{0}._{1}".format(key, volumes_per_instance)
if per_instance in ebs_configuration: if per_instance in ebs_configuration:
instance_group.pop(per_instance) instance_group.pop(per_instance)
ebs_block[volumes_per_instance] = int( ebs_block[volumes_per_instance] = int(