Merge pull request #1604 from ilvalle/fix_1570

prevent is_empty from stripping whitespaces, close #1570
This commit is contained in:
mdipierro authored and GitHub committed 2017-04-28 08:07:20 -05:00
commit 496112c4fe
2 files changed
+6 -5

No files matched your search

+3 -3
View File
@@ -442,13 +442,13 @@ class TestValidators(unittest.TestCase):
rtn = IS_NOT_EMPTY()(' ') rtn = IS_NOT_EMPTY()(' ')
self.assertEqual(rtn, (' ', 'Enter a value')) self.assertEqual(rtn, (' ', 'Enter a value'))
rtn = IS_NOT_EMPTY()(' \n\t') rtn = IS_NOT_EMPTY()(' \n\t')
self.assertEqual(rtn, ('', 'Enter a value')) self.assertEqual(rtn, (' \n\t', 'Enter a value'))
rtn = IS_NOT_EMPTY()([]) rtn = IS_NOT_EMPTY()([])
self.assertEqual(rtn, ([], 'Enter a value')) self.assertEqual(rtn, ([], 'Enter a value'))
rtn = IS_NOT_EMPTY(empty_regex='def')('def') rtn = IS_NOT_EMPTY(empty_regex='def')('def')
self.assertEqual(rtn, ('', 'Enter a value')) self.assertEqual(rtn, ('def', 'Enter a value'))
rtn = IS_NOT_EMPTY(empty_regex='de[fg]')('deg') rtn = IS_NOT_EMPTY(empty_regex='de[fg]')('deg')
self.assertEqual(rtn, ('', 'Enter a value')) self.assertEqual(rtn, ('deg', 'Enter a value'))
rtn = IS_NOT_EMPTY(empty_regex='def')('abc') rtn = IS_NOT_EMPTY(empty_regex='def')('abc')
self.assertEqual(rtn, ('abc', None)) self.assertEqual(rtn, ('abc', None))
+3 -2
View File
@@ -989,14 +989,15 @@ class IS_DECIMAL_IN_RANGE(Validator):
def is_empty(value, empty_regex=None): def is_empty(value, empty_regex=None):
_value = value
"""test empty field""" """test empty field"""
if isinstance(value, (str, unicodeT)): if isinstance(value, (str, unicodeT)):
value = value.strip() value = value.strip()
if empty_regex is not None and empty_regex.match(value): if empty_regex is not None and empty_regex.match(value):
value = '' value = ''
if value is None or value == '' or value == []: if value is None or value == '' or value == []:
return (value, True) return (_value, True)
return (value, False) return (_value, False)
class IS_NOT_EMPTY(Validator): class IS_NOT_EMPTY(Validator):