Ticket #16123: patch_for_ticket16123.diff

tests/regressiontests/i18n/tests.py

@@ -492 +492 @@
                 self.assertEqual(template2.render(context), output2)
                 self.assertEqual(template3.render(context), output3)
 
+    def test_datetime_utf8_encoding(self):
+        """
+        Tests whether utf-8 characters are recognized in DateField inputs, f.e. u'31 мая 2011'
+        """
+        from django.forms.fields import DateField, DateTimeField
+        from locale import setlocale, LC_ALL
+        setlocale(LC_ALL, 'ru_RU.utf-8') # Make sure you have the Russian language installed...
+        self.assertEqual(DateField().strptime(u'31 мая 2011', '%d %b %Y'), datetime.date(2011, 5, 31))
+        self.assertEqual(DateTimeField().strptime(u'31 мая 2011', '%d %b %Y'), datetime.datetime(2011, 5, 31))
+
+
 class MiscTests(TestCase):
 
     def test_parse_spec_http_header(self):

django/forms/fields.py

@@ -373 +373 @@
         return super(DateField, self).to_python(value)
 
     def strptime(self, value, format):
-        return datetime.date(*time.strptime(value, format)[:3])
+        return datetime.date(*time.strptime(value.encode('utf-8'), format)[:3])
 
 class TimeField(BaseTemporalField):
     widget = TimeInput
@@ -425 +425 @@
         return super(DateTimeField, self).to_python(value)
 
     def strptime(self, value, format):
-        return datetime.datetime.strptime(value, format)
+        return datetime.datetime.strptime(value.encode('utf-8'), format)
 
 class RegexField(CharField):
     def __init__(self, regex, max_length=None, min_length=None, error_message=None, *args, **kwargs):