tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-21 12:44:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor to simplify _parse_valid_types

Browse Source 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
This commit is contained in:
Mazz Mosley 2015-09-14 17:23:05 +01:00
parent cf7b595385
commit 1007ad0f86
1 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
compose/config/validation.py
View File

@ -95,6 +95,12 @@ def get_unsupported_config_msg(service_name, error_key):
return msg return msg
def anglicize_validator(validator):
if validator in ["array", "object"]:
return 'an ' + validator
return 'a ' + validator
def process_errors(errors, service_name=None): def process_errors(errors, service_name=None):
""" """
jsonschema gives us an error tree full of information to explain what has jsonschema gives us an error tree full of information to explain what has
@ -112,30 +118,20 @@ def process_errors(errors, service_name=None):
A validator value can be either an array of valid types or a string of A validator value can be either an array of valid types or a string of
a valid type. Parse the valid types and prefix with the correct article. a valid type. Parse the valid types and prefix with the correct article.
""" """
pre_msg_type_prefix = "a"
last_msg_type_prefix = "a"
types_requiring_an = ["array", "object"]
if isinstance(validator, list): if isinstance(validator, list):
last_type = validator.pop() if len(validator) >= 2:
types_from_validator = ", ".join(validator) first_type = anglicize_validator(validator[0])
last_type = anglicize_validator(validator[-1])
types_from_validator = "{}{}".format(first_type, ", ".join(validator[1:-1]))
if validator[0] in types_requiring_an: msg = "{} or {}".format(
pre_msg_type_prefix = "an"
if last_type in types_requiring_an:
last_msg_type_prefix = "an"
msg = "{} {} or {} {}".format(
pre_msg_type_prefix,
types_from_validator, types_from_validator,
last_msg_type_prefix,
last_type last_type
) )
else: else:
if validator in types_requiring_an: msg = "{}".format(anglicize_validator(validator[0]))
pre_msg_type_prefix = "an" else:
msg = "{} {}".format(pre_msg_type_prefix, validator) msg = "{}".format(anglicize_validator(validator))
return msg return msg
@ -163,9 +159,6 @@ def process_errors(errors, service_name=None):
return msg return msg
types = [context.validator_value for context in error.context if context.validator == 'type'] types = [context.validator_value for context in error.context if context.validator == 'type']
if len(types) == 1:
valid_types = _parse_valid_types_from_validator(types[0])
else:
valid_types = _parse_valid_types_from_validator(types) valid_types = _parse_valid_types_from_validator(types)
msg = "contains an invalid type, it should be {}".format(valid_types) msg = "contains an invalid type, it should be {}".format(valid_types)