From 188b003014dc727ca22f7fafb21cf2fa0b3472d2 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Sat, 4 Jan 2020 11:44:11 +0100 Subject: Fixed #15982 -- Added DATE_INPUT_FORMATS to forms.DateTimeField default input formats. --- django/forms/fields.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'django/forms') diff --git a/django/forms/fields.py b/django/forms/fields.py index 29d3058b83..c5374c7e9d 100644 --- a/django/forms/fields.py +++ b/django/forms/fields.py @@ -435,9 +435,15 @@ class TimeField(BaseTemporalField): return datetime.datetime.strptime(value, format).time() +class DateTimeFormatsIterator: + def __iter__(self): + yield from formats.get_format('DATETIME_INPUT_FORMATS') + yield from formats.get_format('DATE_INPUT_FORMATS') + + class DateTimeField(BaseTemporalField): widget = DateTimeInput - input_formats = formats.get_format_lazy('DATETIME_INPUT_FORMATS') + input_formats = DateTimeFormatsIterator() default_error_messages = { 'invalid': _('Enter a valid date/time.'), } -- cgit v1.3