File tree Expand file tree Collapse file tree 3 files changed +7
-11
lines changed
Expand file tree Collapse file tree 3 files changed +7
-11
lines changed Original file line number Diff line number Diff line change 88 # In case we are in python 3 the string check is different
99 basestring = str
1010
11- literal_range = range
12-
1311
1412def property_is_enum (enum_type ):
1513 def property_type_decorator (func ):
@@ -71,7 +69,7 @@ def wrapper(self, value):
7169 return wrapper
7270
7371
74- def property_is_int (range , allowed = None ):
72+ def property_is_int (valid_int_range , allowed = None ):
7573 '''Takes a range of ints and a list of exemptions to check against
7674 when setting a property on a model. The range is a tuple of (min, max) and the
7775 allowed list (empty by default) allows values outside that range.
@@ -88,15 +86,13 @@ def property_type_decorator(func):
8886 def wrapper (self , value ):
8987 error = "Invalid property defined: '{}'. Integer value expected." .format (value )
9088
91- if range is None :
89+ if valid_int_range is None :
9290 if isinstance (value , int ):
9391 return func (self , value )
9492 else :
9593 raise ValueError (error )
9694
97- range_ = literal_range (* range )
98-
99- if (value not in range_ ) and (value not in allowed ):
95+ if (value not in range (* valid_int_range )) and (value not in allowed ):
10096 raise ValueError (error )
10197
10298 return func (self , value )
Original file line number Diff line number Diff line change @@ -76,7 +76,7 @@ def priority(self):
7676 return self ._priority
7777
7878 @priority .setter
79- @property_is_int (range = (1 , 100 ))
79+ @property_is_int (valid_int_range = (1 , 100 ))
8080 def priority (self , value ):
8181 self ._priority = value
8282
Original file line number Diff line number Diff line change @@ -125,7 +125,7 @@ def max_age(self):
125125 return self ._max_age
126126
127127 @max_age .setter
128- @property_is_int (range = (0 , 240 ), allowed = [- 1 ])
128+ @property_is_int (valid_int_range = (0 , 240 ), allowed = [- 1 ])
129129 def max_age (self , value ):
130130 self ._max_age = value
131131
@@ -153,7 +153,7 @@ def max_age(self):
153153 return self ._max_age
154154
155155 @max_age .setter
156- @property_is_int (range = (0 , 240 ), allowed = [- 1 ])
156+ @property_is_int (valid_int_range = (0 , 240 ), allowed = [- 1 ])
157157 def max_age (self , value ):
158158 self ._max_age = value
159159
@@ -198,7 +198,7 @@ def max_age(self):
198198 return self ._max_age
199199
200200 @max_age .setter
201- @property_is_int (range = (0 , 240 ), allowed = [- 1 ])
201+ @property_is_int (valid_int_range = (0 , 240 ), allowed = [- 1 ])
202202 def max_age (self , value ):
203203 self ._max_age = value
204204
You can’t perform that action at this time.
0 commit comments