summaryrefslogtreecommitdiff
path: root/django/forms/fields.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/forms/fields.py')
-rw-r--r--django/forms/fields.py9
1 files changed, 7 insertions, 2 deletions
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):