Skip to content

Commit f30bb04

Browse files
committed
[property] Change values Validation Error Message
Move from _validate_values and check only for dtypes "date", "time" and "datetime".
1 parent 5797d20 commit f30bb04

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

odml/property.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,6 @@ def _validate_values(self, values):
247247
try:
248248
dtypes.get(v, self.dtype)
249249
except Exception:
250-
raise ValueError("odml.Property.values: passed value \'%s\' are not of "
251-
"consistent type \'%s\'! Format should be \'%s\'." %
252-
(v, self._dtype, dtypes.default_values(self._dtype)))
253250
return False
254251
return True
255252

@@ -330,7 +327,14 @@ def values(self, new_value):
330327
if self._dtype is None:
331328
self._dtype = dtypes.infer_dtype(new_value[0])
332329

333-
self._validate_values(new_value)
330+
if not self._validate_values(new_value):
331+
if self._dtype in ("date", "time", "datetime"):
332+
raise ValueError("odml.Property.values: passed values are not of "
333+
"consistent type \'%s\'! Format should be \'%s\'." %
334+
(self._dtype, dtypes.default_values(self._dtype)))
335+
else:
336+
raise ValueError("odml.Property.values: passed values are not of "
337+
"consistent type!")
334338
self._values = [dtypes.get(v, self.dtype) for v in new_value]
335339

336340
@property

0 commit comments

Comments
 (0)