dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

consistency in error messages of number range validators

Browse Source
This commit is contained in:
Stefan Pochmann
2013-10-12 21:22:11 +02:00
parent 667069b573
commit 34bfe4527d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/validators.py
+5 -4
View File
@@ -718,8 +718,9 @@ class IS_INT_IN_RANGE(Validator):
self.minimum = self.maximum = None self.minimum = self.maximum = None
if minimum is None: if minimum is None:
if maximum is None: if maximum is None:
self.error_message = translate( if error_message is None:
error_message or 'enter an integer') error_message = 'enter an integer'
self.error_message = translate(error_message)
else: else:
self.maximum = int(maximum) self.maximum = int(maximum)
if error_message is None: if error_message is None:
@@ -896,7 +897,7 @@ class IS_DECIMAL_IN_RANGE(Validator):
>>> IS_DECIMAL_IN_RANGE(0,99)('12.34') >>> IS_DECIMAL_IN_RANGE(0,99)('12.34')
(Decimal('12.34'), None) (Decimal('12.34'), None)
>>> IS_DECIMAL_IN_RANGE()('abc') >>> IS_DECIMAL_IN_RANGE()('abc')
('abc', 'enter a decimal number') ('abc', 'enter a number')
""" """
def __init__( def __init__(
@@ -911,7 +912,7 @@ class IS_DECIMAL_IN_RANGE(Validator):
if minimum is None: if minimum is None:
if maximum is None: if maximum is None:
if error_message is None: if error_message is None:
error_message = 'enter a decimal number' error_message = 'enter a number'
else: else:
self.maximum = decimal.Decimal(str(maximum)) self.maximum = decimal.Decimal(str(maximum))
if error_message is None: if error_message is None: