diff --git a/VERSION b/VERSION index 75146f1f..60ae417d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.16.1-stable+timestamp.2018.05.01.21.42.57 +Version 2.16.1-stable+timestamp.2018.05.24.15.00.45 diff --git a/gluon/packages/dal b/gluon/packages/dal index b6520165..c954d1a2 160000 --- a/gluon/packages/dal +++ b/gluon/packages/dal @@ -1 +1 @@ -Subproject commit b652016533661b43fc49e48ab3112e6c684ba627 +Subproject commit c954d1a22a0b83d90f728a4ab2daaa954e3f16c8 diff --git a/gluon/tests/test_validators.py b/gluon/tests/test_validators.py index 7d66fa8e..6ffc8902 100644 --- a/gluon/tests/test_validators.py +++ b/gluon/tests/test_validators.py @@ -765,9 +765,9 @@ class TestValidators(unittest.TestCase): rtn = IS_LIST_OF(IS_INT_IN_RANGE(0, 10))(1) self.assertEqual(rtn, ([1], None)) rtn = IS_LIST_OF(IS_INT_IN_RANGE(0, 10), minimum=10)([1, 2]) - self.assertEqual(rtn, ([1, 2], 'Enter between 10 and 100 values')) + self.assertEqual(rtn, ([1, 2], 'Minimum length is 10')) rtn = IS_LIST_OF(IS_INT_IN_RANGE(0, 10), maximum=2)([1, 2, 3]) - self.assertEqual(rtn, ([1, 2, 3], 'Enter between 0 and 2 values')) + self.assertEqual(rtn, ([1, 2, 3], 'Maximum length is 2')) # regression test for issue 742 rtn = IS_LIST_OF(minimum=1)('') self.assertEqual(rtn, ([], 'Enter between 1 and 100 values')) diff --git a/gluon/validators.py b/gluon/validators.py index 3659e82d..3a70d585 100644 --- a/gluon/validators.py +++ b/gluon/validators.py @@ -2568,8 +2568,7 @@ class IS_DATETIME_IN_RANGE(IS_DATETIME): class IS_LIST_OF(Validator): - def __init__(self, other=None, minimum=None, maximum=None, - error_message=None): + def __init__(self, other=None, minimum=None, maximum=None, error_message=None): self.other = other self.minimum = minimum self.maximum = maximum