encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-03-03 19:00:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yuri Prezument 2013-02-21 15:36:17 +02:00
parent 8fa82822a0
commit 5f531fc1ea
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rest_framework/fields.py
View File

@ -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):
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):
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):
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)