sh-edraft.de/sh_cpl
2
1
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects 1 Releases 12 Wiki Activity

Improved dependency injection

Browse Source
This commit is contained in:
Sven Heidemann
2021-03-04 19:06:16 +01:00
parent 6452226b50
commit 69211cc9e8
7 changed files with 74 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/cpl/configuration/configuration.py
View File

@@ -134,7 +134,7 @@ class Configuration(ConfigurationABC):
exit()
def add_json_file(self, name: str, optional: bool = None, output: bool = False):
def add_json_file(self, name: str, optional: bool = None, output: bool = True):
if self._hosting_environment.content_root_path.endswith('/') and not name.startswith('/'):
file_path = f'{self._hosting_environment.content_root_path}{name}'
else:
@@ -177,8 +177,7 @@ class Configuration(ConfigurationABC):
def add_configuration(self, key_type: type, value: ConfigurationModelABC):
self._config[key_type] = value
def get_configuration(self, search_type: Union[str, Type[ConfigurationModelABC]]) -> Union[
str, Callable[ConfigurationModelABC]]:
def get_configuration(self, search_type: Union[str, Type[ConfigurationModelABC]]) -> Union[str, Callable[ConfigurationModelABC]]:
if search_type not in self._config:
raise Exception(f'Config model by type {search_type} not found')

2
src/cpl/configuration/configuration_abc.py
View File

@@ -37,7 +37,7 @@ class ConfigurationABC(ABC):
def add_console_arguments(self): pass
@abstractmethod
def add_json_file(self, name: str, optional: bool = None, output: bool = False): pass
def add_json_file(self, name: str, optional: bool = None, output: bool = True): pass
@abstractmethod
def add_configuration(self, key_type: type, value: object): pass