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

Run black on moto & test directories.

Browse source
This commit is contained in:
Asher Foa 2019-10-31 08:44:26 -07:00
commit 96e5b1993d
507 changed files with 52541 additions and 47814 deletions
Download patch file Download diff file Expand all files Collapse all files

28
moto/emr/utils.py
View file

@ -7,24 +7,24 @@ import six
def random_id(size=13):
chars = list(range(10)) + list(string.ascii_uppercase)
return ''.join(six.text_type(random.choice(chars)) for x in range(size))
return "".join(six.text_type(random.choice(chars)) for x in range(size))
def random_cluster_id(size=13):
return 'j-{0}'.format(random_id())
return "j-{0}".format(random_id())
def random_step_id(size=13):
return 's-{0}'.format(random_id())
return "s-{0}".format(random_id())
def random_instance_group_id(size=13):
return 'i-{0}'.format(random_id())
return "i-{0}".format(random_id())
def tags_from_query_string(querystring_dict):
prefix = 'Tags'
suffix = 'Key'
prefix = "Tags"
suffix = "Key"
response_values = {}
for key, value in querystring_dict.items():
if key.startswith(prefix) and key.endswith(suffix):
@ -32,8 +32,7 @@ def tags_from_query_string(querystring_dict):
tag_key = querystring_dict.get("Tags.{0}.Key".format(tag_index))[0]
tag_value_key = "Tags.{0}.Value".format(tag_index)
if tag_value_key in querystring_dict:
response_values[tag_key] = querystring_dict.get(tag_value_key)[
0]
response_values[tag_key] = querystring_dict.get(tag_value_key)[0]
else:
response_values[tag_key] = None
return response_values
@ -42,14 +41,15 @@ def tags_from_query_string(querystring_dict):
def steps_from_query_string(querystring_dict):
steps = []
for step in querystring_dict:
step['jar'] = step.pop('hadoop_jar_step._jar')
step['properties'] = dict((o['Key'], o['Value'])
for o in step.get('properties', []))
step['args'] = []
step["jar"] = step.pop("hadoop_jar_step._jar")
step["properties"] = dict(
(o["Key"], o["Value"]) for o in step.get("properties", [])
)
step["args"] = []
idx = 1
keyfmt = 'hadoop_jar_step._args.member.{0}'
keyfmt = "hadoop_jar_step._args.member.{0}"
while keyfmt.format(idx) in step:
step['args'].append(step.pop(keyfmt.format(idx)))
step["args"].append(step.pop(keyfmt.format(idx)))
idx += 1
steps.append(step)
return steps