Skip to content

Commit 4c38991

Browse files
refactor: remove TVimConfig and fix code quality issues (#27)
1 parent eed9b02 commit 4c38991

File tree

6 files changed

+14
-21
lines changed

6 files changed

+14
-21
lines changed

python_coderunner/src/coderunner_factory/vim_coderunner_factory.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
TBasicCommandDispatcherStrategySelector,
1414
)
1515
from ..commands_executor import TVimCommandsExecutor
16-
from ..config import EDispatchersTypes, TConfigField, TVimConfig
16+
from ..config import EDispatchersTypes, TBasicConfig, TConfigField
1717
from ..config.getter import (
1818
TVimByFileExtConfigValueGetter,
1919
TVimByFileTypeConfigValueGetter,
@@ -43,7 +43,7 @@
4343

4444
class TVimCodeRunnerFactory(ICodeRunnerFactory):
4545
def create(self) -> TCodeRunner | None:
46-
config: TVimConfig = self._create_config()
46+
config: TBasicConfig = self._create_config()
4747
message_printer: TVimMessagePrinter = TVimMessagePrinter()
4848

4949
try:
@@ -73,8 +73,8 @@ def create(self) -> TCodeRunner | None:
7373

7474
return None
7575

76-
def _create_config(self) -> TVimConfig:
77-
return TVimConfig(
76+
def _create_config(self) -> TBasicConfig:
77+
return TBasicConfig(
7878
by_file_ext_field=TConfigField(
7979
name="g:coderunner_by_file_ext",
8080
getter=TVimByFileExtConfigValueGetter(),
@@ -145,7 +145,7 @@ def _create_config(self) -> TVimConfig:
145145

146146
def _create_command_dispatcher_strategy_selector(
147147
self,
148-
config: TVimConfig,
148+
config: TBasicConfig,
149149
file_info_extractor: TVimFileInfoExtractor,
150150
project_info_extractor: TVimProjectInfoExtractor,
151151
) -> TBasicCommandDispatcherStrategySelector:
@@ -172,7 +172,7 @@ def _create_command_dispatcher_strategy_selector(
172172

173173
def _create_file_ext_command_builders_dispatcher(
174174
self,
175-
config: TVimConfig,
175+
config: TBasicConfig,
176176
file_info_extractor: TVimFileInfoExtractor,
177177
project_info_extractor: TVimProjectInfoExtractor,
178178
) -> TFileExtCommandBuildersDispatcher:
@@ -186,7 +186,7 @@ def _create_file_ext_command_builders_dispatcher(
186186

187187
def _create_file_type_command_builders_dispatcher(
188188
self,
189-
config: TVimConfig,
189+
config: TBasicConfig,
190190
file_info_extractor: TVimFileInfoExtractor,
191191
project_info_extractor: TVimProjectInfoExtractor,
192192
) -> TFileTypeCommandBuildersDispatcher:
@@ -200,7 +200,7 @@ def _create_file_type_command_builders_dispatcher(
200200

201201
def _create_glob_command_builders_dispatcher(
202202
self,
203-
config: TVimConfig,
203+
config: TBasicConfig,
204204
file_info_extractor: TVimFileInfoExtractor,
205205
project_info_extractor: TVimProjectInfoExtractor,
206206
) -> TGlobCommandBuildersDispatcher:

python_coderunner/src/commands_executor/interface.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
class ICommandsExecutor(ABC):
55
"""
6-
Сlass for executing a string command only.
6+
Class for executing a string command only.
77
"""
88

99
@abstractmethod

python_coderunner/src/config/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@
22
from .config_field import TConfigField
33
from .exceptions import ConfigFieldUndefinedValueError, ConfigFieldValidationError
44
from .interface import EDispatchersTypes, IConfig
5-
from .vim_config import TVimConfig
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
from typing import Any
1+
from typing import Any, ClassVar
22

33
from ..interface import EDispatchersTypes
44
from .exceptions import ValidationError
55
from .interface import IValidator
66

77

88
class TDispatchersOrderValidator(IValidator[list[EDispatchersTypes]]):
9-
def __init__(self) -> None:
10-
self.allowed_dispatcher_types: set[EDispatchersTypes] = set(EDispatchersTypes)
9+
_ALLOWED_DISPATCHER_TYPES: ClassVar[set[EDispatchersTypes]] = set(EDispatchersTypes)
1110

1211
def __call__(self, value: Any) -> list[EDispatchersTypes]:
1312
if not isinstance(value, list):
1413
raise ValidationError(f"Invalid dispatcher order container type: {type(value)}.")
1514

16-
if invalid_items := [v for v in value if v not in self.allowed_dispatcher_types]:
15+
if invalid_items := [v for v in value if v not in self._ALLOWED_DISPATCHER_TYPES]:
1716
raise ValidationError(f"Invalid dispatcher types values: {', '.join(map(str, invalid_items))}.")
1817

1918
return value

python_coderunner/src/config/vim_config.py

Lines changed: 0 additions & 5 deletions
This file was deleted.

python_coderunner/tests/unit/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
from src.config import (
2222
EDispatchersTypes,
2323
IConfig,
24+
TBasicConfig,
2425
TConfigField,
25-
TVimConfig,
2626
)
2727
from src.config.getter import (
2828
IConfigValueGetter,
@@ -56,7 +56,7 @@ def fixture_config(request: pytest.FixtureRequest) -> IConfig:
5656

5757
@pytest.fixture
5858
def fixture_vim_config() -> IConfig:
59-
return TVimConfig(
59+
return TBasicConfig(
6060
by_file_ext_field=TConfigField(
6161
name="g:coderunner_by_file_ext",
6262
getter=TVimByFileExtConfigValueGetter(),

0 commit comments

Comments
 (0)