Commit 5f531fc1 by Yuri Prezument

Catch TypeError as well as ValueError when parsing dates, ref #699

parent 8fa82822
...@@ -472,7 +472,7 @@ class DateField(WritableField): ...@@ -472,7 +472,7 @@ class DateField(WritableField):
parsed = parse_date(value) parsed = parse_date(value)
if parsed is not None: if parsed is not None:
return parsed return parsed
except ValueError: except (ValueError, TypeError):
msg = self.error_messages['invalid_date'] % value msg = self.error_messages['invalid_date'] % value
raise ValidationError(msg) raise ValidationError(msg)
...@@ -520,7 +520,7 @@ class DateTimeField(WritableField): ...@@ -520,7 +520,7 @@ class DateTimeField(WritableField):
parsed = parse_datetime(value) parsed = parse_datetime(value)
if parsed is not None: if parsed is not None:
return parsed return parsed
except ValueError: except (ValueError, TypeError):
msg = self.error_messages['invalid_datetime'] % value msg = self.error_messages['invalid_datetime'] % value
raise ValidationError(msg) raise ValidationError(msg)
...@@ -528,7 +528,7 @@ class DateTimeField(WritableField): ...@@ -528,7 +528,7 @@ class DateTimeField(WritableField):
parsed = parse_date(value) parsed = parse_date(value)
if parsed is not None: if parsed is not None:
return datetime.datetime(parsed.year, parsed.month, parsed.day) return datetime.datetime(parsed.year, parsed.month, parsed.day)
except ValueError: except (ValueError, TypeError):
msg = self.error_messages['invalid_date'] % value msg = self.error_messages['invalid_date'] % value
raise ValidationError(msg) raise ValidationError(msg)
...@@ -558,7 +558,7 @@ class TimeField(WritableField): ...@@ -558,7 +558,7 @@ class TimeField(WritableField):
parsed = parse_time(value) parsed = parse_time(value)
assert parsed is not None assert parsed is not None
return parsed return parsed
except ValueError: except (ValueError, TypeError):
msg = self.error_messages['invalid'] % value msg = self.error_messages['invalid'] % value
raise ValidationError(msg) raise ValidationError(msg)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment