From 81febf4defe6f6da2dea80f24082b282b8bf30ca Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 3 Jul 2017 10:16:48 -0400 Subject: [1.11.x] Fixed #28355 -- Fixed widget rendering of non-ASCII date/time formats on Python 2. --- django/forms/widgets.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'django/forms') diff --git a/django/forms/widgets.py b/django/forms/widgets.py index c2bc534e5a..67108e450b 100644 --- a/django/forms/widgets.py +++ b/django/forms/widgets.py @@ -463,7 +463,9 @@ class DateTimeBaseInput(TextInput): self.format = format if format else None def format_value(self, value): - return formats.localize_input(value, self.format or formats.get_format(self.format_key)[0]) + if value is not None: + # localize_input() returns str on Python 2. + return force_text(formats.localize_input(value, self.format or formats.get_format(self.format_key)[0])) class DateInput(DateTimeBaseInput): -- cgit v1.3