From 1487f16f2d29c7aeaf48117d02a1d7bbeafa3d94 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Wed, 9 Oct 2019 12:08:50 +0200 Subject: Fixed #11385 -- Made forms.DateTimeField accept ISO 8601 date inputs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks José Padilla for the initial patch, and Carlton Gibson for the review. --- django/forms/fields.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'django/forms') diff --git a/django/forms/fields.py b/django/forms/fields.py index 285f8cfc76..29d3058b83 100644 --- a/django/forms/fields.py +++ b/django/forms/fields.py @@ -25,7 +25,7 @@ from django.forms.widgets import ( URLInput, ) from django.utils import formats -from django.utils.dateparse import parse_duration +from django.utils.dateparse import parse_datetime, parse_duration from django.utils.duration import duration_string from django.utils.ipv6 import clean_ipv6_address from django.utils.regex_helper import _lazy_re_compile @@ -459,7 +459,12 @@ class DateTimeField(BaseTemporalField): if isinstance(value, datetime.date): result = datetime.datetime(value.year, value.month, value.day) return from_current_timezone(result) - result = super().to_python(value) + try: + result = parse_datetime(value.strip()) + except ValueError: + raise ValidationError(self.error_messages['invalid'], code='invalid') + if not result: + result = super().to_python(value) return from_current_timezone(result) def strptime(self, value, format): -- cgit v1.3