Improved validator + tests

alecthomas · Oct 24, 2016 · ff06372 · ff06372
1 parent 0fe64cd
commit ff06372
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/voluptuous/tests/tests.py b/voluptuous/tests/tests.py
@@ -756,4 +756,5 @@ def test_datetime():
 def test_date():
     schema = Schema({"date": Date()})
     schema({"date": "2016-10-24"})
+    assert_raises(MultipleInvalid, schema, {"date": "2016-10-2"})
     assert_raises(MultipleInvalid, schema, {"date": "2016-10-24Z"})
diff --git a/voluptuous/validators.py b/voluptuous/validators.py
@@ -595,9 +595,11 @@ class Date(Datetime):
 
     def __call__(self, v):
         try:
-            datetime.datetime.strptime(v, self.format).date()
+            datetime.datetime.strptime(v, self.format)
             if len(v) != len(self.FORMAT_DESCRIPTION):
-                raise ValueError
+                raise DateInvalid(
+                    self.msg or 'value has invalid length'
+                                ' expected length %d (%s)' % (len(self.FORMAT_DESCRIPTION), self.FORMAT_DESCRIPTION))
         except (TypeError, ValueError):
             raise DateInvalid(
                 self.msg or 'value does not match'