Skip to content

Commit 82f8cb6

Browse files
committed
Moving type checker after min,max checkers.
1 parent 5b878ed commit 82f8cb6

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

pyvalid/validators/__iterable.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,18 +159,18 @@ def checkers(self):
159159
@accepts(object, empty_allowed=bool, element_type=(str, int, float),
160160
min_val=(int, float), max_val=(int, float))
161161
def __init__(self, **kwargs):
162-
iterable_type = kwargs.get('iterable_type', None)
163-
empty_allowed = kwargs.get('empty_allowed', None)
164-
elements_type = kwargs.get('elements_type', None)
165162
min_val = kwargs.get('min_val', None)
166163
max_val = kwargs.get('max_val', None)
167164
if min_val is not None and max_val is not None and min_val > max_val:
168165
raise ValueError('Min value can\'t be greater than max value!')
166+
iterable_type = kwargs.get('iterable_type', None)
167+
empty_allowed = kwargs.get('empty_allowed', None)
168+
elements_type = kwargs.get('elements_type', None)
169169

170170
self.__checkers = {
171-
IterableValidator.iterable_type_checker: [iterable_type],
172171
IterableValidator.empty_checker: [empty_allowed],
173172
IterableValidator.element_type_checker: [elements_type],
173+
IterableValidator.iterable_type_checker: [iterable_type],
174174
IterableValidator.elements_min_val_checker: [min_val],
175175
IterableValidator.elements_max_val_checker: [max_val]
176176
}

pyvalid/validators/__number.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,18 @@ def checkers(self):
6767
in_range=[Iterable, Container], not_in_range=[Iterable, Container]
6868
)
6969
def __init__(self, **kwargs):
70-
number_type = kwargs.get('number_type', None)
7170
min_val = kwargs.get('min_val', None)
7271
max_val = kwargs.get('max_val', None)
7372
if min_val is not None and max_val is not None and min_val > max_val:
7473
raise ValueError('Min value can\'t be greater than max value!')
74+
number_type = kwargs.get('number_type', None)
7575
in_range = kwargs.get('in_range', None)
7676
not_in_range = kwargs.get('not_in_range', None)
7777

7878
self.__checkers = {
79-
NumberValidator.number_type_checker: [number_type],
8079
NumberValidator.min_val_checker: [min_val],
8180
NumberValidator.max_val_checker: [max_val],
81+
NumberValidator.number_type_checker: [number_type],
8282
NumberValidator.in_range_checker: [in_range],
8383
NumberValidator.not_in_range_checker: [not_in_range]
8484
}

0 commit comments

Comments
 (0)