diff --git a/python_coderunner/src/coderunner_factory/vim_coderunner_factory.py b/python_coderunner/src/coderunner_factory/vim_coderunner_factory.py index c5e0104..8f4e644 100644 --- a/python_coderunner/src/coderunner_factory/vim_coderunner_factory.py +++ b/python_coderunner/src/coderunner_factory/vim_coderunner_factory.py @@ -13,7 +13,7 @@ TBasicCommandDispatcherStrategySelector, ) from ..commands_executor import TVimCommandsExecutor -from ..config import EDispatchersTypes, TConfigField, TVimConfig +from ..config import EDispatchersTypes, TBasicConfig, TConfigField from ..config.getter import ( TVimByFileExtConfigValueGetter, TVimByFileTypeConfigValueGetter, @@ -43,7 +43,7 @@ class TVimCodeRunnerFactory(ICodeRunnerFactory): def create(self) -> TCodeRunner | None: - config: TVimConfig = self._create_config() + config: TBasicConfig = self._create_config() message_printer: TVimMessagePrinter = TVimMessagePrinter() try: @@ -73,8 +73,8 @@ def create(self) -> TCodeRunner | None: return None - def _create_config(self) -> TVimConfig: - return TVimConfig( + def _create_config(self) -> TBasicConfig: + return TBasicConfig( by_file_ext_field=TConfigField( name="g:coderunner_by_file_ext", getter=TVimByFileExtConfigValueGetter(), @@ -145,7 +145,7 @@ def _create_config(self) -> TVimConfig: def _create_command_dispatcher_strategy_selector( self, - config: TVimConfig, + config: TBasicConfig, file_info_extractor: TVimFileInfoExtractor, project_info_extractor: TVimProjectInfoExtractor, ) -> TBasicCommandDispatcherStrategySelector: @@ -172,7 +172,7 @@ def _create_command_dispatcher_strategy_selector( def _create_file_ext_command_builders_dispatcher( self, - config: TVimConfig, + config: TBasicConfig, file_info_extractor: TVimFileInfoExtractor, project_info_extractor: TVimProjectInfoExtractor, ) -> TFileExtCommandBuildersDispatcher: @@ -186,7 +186,7 @@ def _create_file_ext_command_builders_dispatcher( def _create_file_type_command_builders_dispatcher( self, - config: TVimConfig, + config: TBasicConfig, file_info_extractor: TVimFileInfoExtractor, project_info_extractor: TVimProjectInfoExtractor, ) -> TFileTypeCommandBuildersDispatcher: @@ -200,7 +200,7 @@ def _create_file_type_command_builders_dispatcher( def _create_glob_command_builders_dispatcher( self, - config: TVimConfig, + config: TBasicConfig, file_info_extractor: TVimFileInfoExtractor, project_info_extractor: TVimProjectInfoExtractor, ) -> TGlobCommandBuildersDispatcher: diff --git a/python_coderunner/src/commands_executor/interface.py b/python_coderunner/src/commands_executor/interface.py index 07b4b36..c0dc68e 100644 --- a/python_coderunner/src/commands_executor/interface.py +++ b/python_coderunner/src/commands_executor/interface.py @@ -3,7 +3,7 @@ class ICommandsExecutor(ABC): """ - Сlass for executing a string command only. + Class for executing a string command only. """ @abstractmethod diff --git a/python_coderunner/src/config/__init__.py b/python_coderunner/src/config/__init__.py index f608de2..60ba92f 100644 --- a/python_coderunner/src/config/__init__.py +++ b/python_coderunner/src/config/__init__.py @@ -2,4 +2,3 @@ from .config_field import TConfigField from .exceptions import ConfigFieldUndefinedValueError, ConfigFieldValidationError from .interface import EDispatchersTypes, IConfig -from .vim_config import TVimConfig diff --git a/python_coderunner/src/config/validator/dispatchers_order_validator.py b/python_coderunner/src/config/validator/dispatchers_order_validator.py index 2d7365b..aca3a41 100644 --- a/python_coderunner/src/config/validator/dispatchers_order_validator.py +++ b/python_coderunner/src/config/validator/dispatchers_order_validator.py @@ -1,4 +1,4 @@ -from typing import Any +from typing import Any, ClassVar from ..interface import EDispatchersTypes from .exceptions import ValidationError @@ -6,14 +6,13 @@ class TDispatchersOrderValidator(IValidator[list[EDispatchersTypes]]): - def __init__(self) -> None: - self.allowed_dispatcher_types: set[EDispatchersTypes] = set(EDispatchersTypes) + _ALLOWED_DISPATCHER_TYPES: ClassVar[set[EDispatchersTypes]] = set(EDispatchersTypes) def __call__(self, value: Any) -> list[EDispatchersTypes]: if not isinstance(value, list): raise ValidationError(f"Invalid dispatcher order container type: {type(value)}.") - if invalid_items := [v for v in value if v not in self.allowed_dispatcher_types]: + if invalid_items := [v for v in value if v not in self._ALLOWED_DISPATCHER_TYPES]: raise ValidationError(f"Invalid dispatcher types values: {', '.join(map(str, invalid_items))}.") return value diff --git a/python_coderunner/src/config/vim_config.py b/python_coderunner/src/config/vim_config.py deleted file mode 100644 index d8bbe23..0000000 --- a/python_coderunner/src/config/vim_config.py +++ /dev/null @@ -1,5 +0,0 @@ -from .basic import TBasicConfig - - -class TVimConfig(TBasicConfig): - """Config for Vim, created through factory""" diff --git a/python_coderunner/tests/unit/conftest.py b/python_coderunner/tests/unit/conftest.py index be497d9..1bbf62f 100644 --- a/python_coderunner/tests/unit/conftest.py +++ b/python_coderunner/tests/unit/conftest.py @@ -21,8 +21,8 @@ from src.config import ( EDispatchersTypes, IConfig, + TBasicConfig, TConfigField, - TVimConfig, ) from src.config.getter import ( IConfigValueGetter, @@ -56,7 +56,7 @@ def fixture_config(request: pytest.FixtureRequest) -> IConfig: @pytest.fixture def fixture_vim_config() -> IConfig: - return TVimConfig( + return TBasicConfig( by_file_ext_field=TConfigField( name="g:coderunner_by_file_ext", getter=TVimByFileExtConfigValueGetter(),