diff options
Diffstat (limited to 'src/buildstream/_options/optionpool.py')
| -rw-r--r-- | src/buildstream/_options/optionpool.py | 38 |
1 files changed, 10 insertions, 28 deletions
diff --git a/src/buildstream/_options/optionpool.py b/src/buildstream/_options/optionpool.py index 3b58a5904..aa1c62a4f 100644 --- a/src/buildstream/_options/optionpool.py +++ b/src/buildstream/_options/optionpool.py @@ -88,10 +88,7 @@ class OptionPool: # Assert that the option name is a valid symbol _assert_symbol_name( - option_name, - "option name", - ref_node=option_definition, - allow_dashes=False, + option_name, "option name", ref_node=option_definition, allow_dashes=False, ) opt_type_name = option_definition.get_enum("type", OptionTypes) @@ -115,8 +112,7 @@ class OptionPool: except KeyError as e: p = option_value.get_provenance() raise LoadError( - "{}: Unknown option '{}' specified".format(p, option_name), - LoadErrorReason.INVALID_DATA, + "{}: Unknown option '{}' specified".format(p, option_name), LoadErrorReason.INVALID_DATA, ) from e option.load_value(node, transform=transform) @@ -136,9 +132,7 @@ class OptionPool: except KeyError as e: if not ignore_unknown: raise LoadError( - "Unknown option '{}' specified on the command line".format( - option_name - ), + "Unknown option '{}' specified on the command line".format(option_name), LoadErrorReason.INVALID_DATA, ) from e else: @@ -237,9 +231,7 @@ class OptionPool: # Variables must be resolved at this point. # try: - template_string = "{{% if {} %}} True {{% else %}} False {{% endif %}}".format( - expression - ) + template_string = "{{% if {} %}} True {{% else %}} False {{% endif %}}".format(expression) template = self._environment.from_string(template_string) context = template.new_context(self._variables, shared=True) result = template.root_render_func(context) @@ -252,13 +244,11 @@ class OptionPool: return False else: # pragma: nocover raise LoadError( - "Failed to evaluate expression: {}".format(expression), - LoadErrorReason.EXPRESSION_FAILED, + "Failed to evaluate expression: {}".format(expression), LoadErrorReason.EXPRESSION_FAILED, ) except jinja2.exceptions.TemplateError as e: raise LoadError( - "Failed to evaluate expression ({}): {}".format(expression, e), - LoadErrorReason.EXPRESSION_FAILED, + "Failed to evaluate expression ({}): {}".format(expression, e), LoadErrorReason.EXPRESSION_FAILED, ) # Recursion assistent for lists, in case there @@ -286,9 +276,7 @@ class OptionPool: # it being overwritten by a later assertion which might also trigger. if assertion is not None: p = node.get_scalar("(!)").get_provenance() - raise LoadError( - "{}: {}".format(p, assertion.strip()), LoadErrorReason.USER_ASSERTION - ) + raise LoadError("{}: {}".format(p, assertion.strip()), LoadErrorReason.USER_ASSERTION) if conditions is not None: del node["(?)"] @@ -298,9 +286,7 @@ class OptionPool: if len(tuples) > 1: provenance = condition.get_provenance() raise LoadError( - "{}: Conditional statement has more than one key".format( - provenance - ), + "{}: Conditional statement has more than one key".format(provenance), LoadErrorReason.INVALID_DATA, ) @@ -312,14 +298,10 @@ class OptionPool: provenance = condition.get_provenance() raise LoadError("{}: {}".format(provenance, e), e.reason) from e - if ( - type(value) is not MappingNode - ): # pylint: disable=unidiomatic-typecheck + if type(value) is not MappingNode: # pylint: disable=unidiomatic-typecheck provenance = condition.get_provenance() raise LoadError( - "{}: Only values of type 'dict' can be composed.".format( - provenance - ), + "{}: Only values of type 'dict' can be composed.".format(provenance), LoadErrorReason.ILLEGAL_COMPOSITE, ) |