Ticket #9979: fields.diff

django/forms/fields.py

@@ -25 +25 @@
 
 import django.core.exceptions
 from django.utils.translation import ugettext_lazy as _
-from django.utils.encoding import smart_unicode, smart_str
+from django.utils.encoding import smart_unicode, smart_str, force_unicode
 
 from util import ErrorList, ValidationError
 from widgets import TextInput, PasswordInput, HiddenInput, MultipleHiddenInput, FileInput, CheckboxInput, Select, NullBooleanSelect, SelectMultiple, DateTimeInput, TimeInput, SplitDateTimeWidget, SplitHiddenDateTimeWidget
@@ -305 +305 @@
             return value
         for format in self.input_formats:
             try:
-                return datetime.date(*time.strptime(value, format)[:3])
+                return datetime.date(*time.strptime(value, force_unicode(format))[:3])
             except ValueError:
                 continue
         raise ValidationError(self.error_messages['invalid'])
@@ -337 +337 @@
             return value
         for format in self.input_formats:
             try:
-                return datetime.time(*time.strptime(value, format)[3:6])
+                return datetime.time(*time.strptime(value, force_unicode(format))[3:6])
             except ValueError:
                 continue
         raise ValidationError(self.error_messages['invalid'])