Minor fixes to the requirement framework.

This commit is contained in:
Mike Auty
2018-09-23 18:13:58 +01:00
parent 828652f9cb
commit 81bef5ace8
2 changed files with 5 additions and 3 deletions
@@ -156,7 +156,7 @@ class ComplexListRequirement(MultiRequirement, configuration.ConfigurableRequire
@abc.abstractmethod
def new_requirement(self, index) -> interfaces.configuration.RequirementInterface:
"""Constructs a new requirement based on the specified index"""
"""Builds a new requirement based on the specified index"""
def build_configuration(self,
context: interfaces.context.ContextInterface,
@@ -256,8 +256,7 @@ class TranslationLayerRequirement(configuration.ConstructableRequirementInterfac
self._validate_class(context, config_path)
vollog.log(constants.LOGLEVEL_V,
"IndexError - No configuration provided: {}".format(
config_path + configuration.CONFIG_SEPARATOR + self.name))
"IndexError - No configuration provided: {}".format(configuration.path_join(config_path, self.name)))
return [configuration.path_join(config_path, self.name)]
def construct(self, context: interfaces.context.ContextInterface, config_path: str) -> None:
@@ -423,6 +423,9 @@ class ConstructableRequirementInterface(RequirementInterface):
requirement_dict: typing.Dict[str, object] = None) \
-> typing.Optional['interfaces.objects.ObjectInterface']:
"""Constructs the class, handing args and the subrequirements as parameters to __init__"""
if self.requirements["class"].unsatisfied(context, config_path):
return None
if not isinstance(self.requirements["class"], ClassRequirement):
return None
cls = self.requirements["class"].cls