summaryrefslogtreecommitdiff
path: root/django/forms
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2020-01-04 11:44:11 +0100
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2020-01-07 11:08:40 +0100
commit188b003014dc727ca22f7fafb21cf2fa0b3472d2 (patch)
tree84b73ec73001ae076eab138f52ab93e8df47a72d /django/forms
parent0f0abc20be55d796ecfc3e7698e7ecfd9e9cdf88 (diff)
Fixed #15982 -- Added DATE_INPUT_FORMATS to forms.DateTimeField default input formats.
Diffstat (limited to 'django/forms')
-rw-r--r--django/forms/fields.py8
1 files changed, 7 insertions, 1 deletions
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.'),
}