Skip to content

Commit bc54cab

Browse files
committed
Change methods to frozenset
1 parent 6a51cbb commit bc54cab

16 files changed

+47
-27
lines changed

.github/workflows/test-lib-building.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ jobs:
2828
run: pip install "$(ls dist/*.whl | head -n 1)[optional]"
2929

3030
- name: Verify library usage - Part I
31-
run: |
32-
echo "import flask_inputfilter.InputFilter" > test_script.py
33-
python test_script.py
31+
run: python -c "import flask_inputfilter.InputFilter"
3432

3533
- name: Verify library usage - Part II
3634
run: pytest tests/

flask_inputfilter/InputFilter.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ class InputFilter(
6060
)
6161

6262
def __init__(self, methods: Optional[List[str]] = None) -> None:
63-
self.__methods = methods or ["GET", "POST", "PATCH", "PUT", "DELETE"]
63+
self.__methods: frozenset = frozenset(
64+
methods or ["GET", "POST", "PATCH", "PUT", "DELETE"]
65+
)
6466
self._fields: Dict[str, FieldModel] = {}
6567
self._conditions: List[BaseCondition] = []
6668
self._global_filters: List[BaseFilter] = []

flask_inputfilter/Mixin/BaseMixin.py

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

flask_inputfilter/Mixin/ConditionMixin.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44

55
from flask_inputfilter.Condition import BaseCondition
66
from flask_inputfilter.Exception import ValidationError
7-
from flask_inputfilter.Mixin import BaseMixin
87

98

10-
class ConditionMixin(BaseMixin):
9+
class ConditionMixin:
10+
__slots__ = ()
11+
1112
@final
1213
def addCondition(self, condition: BaseCondition) -> None:
1314
"""

flask_inputfilter/Mixin/DataMixin.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
from typing_extensions import final
44

5-
from flask_inputfilter.Mixin import BaseMixin
65

6+
class DataMixin:
7+
__slots__ = ()
78

8-
class DataMixin(BaseMixin):
99
@final
1010
def setData(self, data: Dict[str, Any]) -> None:
1111
"""

flask_inputfilter/Mixin/ErrorHandlingMixin.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
from typing_extensions import final
44

5-
from flask_inputfilter.Mixin import BaseMixin
65

6+
class ErrorHandlingMixin:
7+
__slots__ = ()
78

8-
class ErrorHandlingMixin(BaseMixin):
99
@final
1010
def getErrorMessage(self, field_name: str) -> str:
1111
"""

flask_inputfilter/Mixin/ExternalApiMixin.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
from typing import Any, Optional
33

44
from flask_inputfilter.Exception import ValidationError
5-
from flask_inputfilter.Mixin import BaseMixin
65
from flask_inputfilter.Model import ExternalApiConfig
76

87
API_PLACEHOLDER_PATTERN = re.compile(r"{{(.*?)}}")
98

109

11-
class ExternalApiMixin(BaseMixin):
10+
class ExternalApiMixin:
11+
__slots__ = ()
12+
1213
def __callExternalApi(
1314
self, config: ExternalApiConfig, fallback: Any, validated_data: dict
1415
) -> Optional[Any]:

flask_inputfilter/Mixin/FieldMixin.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44

55
from flask_inputfilter.Exception import ValidationError
66
from flask_inputfilter.Filter import BaseFilter
7-
from flask_inputfilter.Mixin import BaseMixin
87
from flask_inputfilter.Model import ExternalApiConfig, FieldModel
98
from flask_inputfilter.Validator import BaseValidator
109

1110

12-
class FieldMixin(BaseMixin):
11+
class FieldMixin:
12+
__slots__ = ()
13+
1314
@final
1415
def add(
1516
self,

flask_inputfilter/Mixin/FilterMixin.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
from typing_extensions import final
44

55
from flask_inputfilter.Filter import BaseFilter
6-
from flask_inputfilter.Mixin import BaseMixin
76

87

9-
class FilterMixin(BaseMixin):
8+
class FilterMixin:
9+
__slots__ = ()
10+
1011
@final
1112
def addGlobalFilter(self, filter: BaseFilter) -> None:
1213
"""

flask_inputfilter/Mixin/ModelMixin.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
from typing_extensions import final
44

5-
from flask_inputfilter.Mixin import BaseMixin
6-
75
if TYPE_CHECKING:
86
from flask_inputfilter import InputFilter
97

108
T = TypeVar("T")
119

1210

13-
class ModelMixin(BaseMixin):
11+
class ModelMixin:
12+
__slots__ = ()
13+
1414
@final
1515
def clear(self) -> None:
1616
"""

0 commit comments

Comments
 (0)