Ticket #17165: trunk.diff

tests/regressiontests/forms/tests/extra.py

@@ -10 +10 @@
 from django.forms.util import ErrorList
 from django.utils import translation, unittest
 from django.utils.encoding import force_unicode, smart_unicode
+from django.utils.formats import get_format
 
 from .error_messages import AssertFormErrorsMixin
 
@@ -697 +698 @@
         w = SelectDateWidget(years=('1899',))
         self.assertEqual(w.value_from_datadict({'date_year': '1899', 'date_month': '8', 'date_day': '13'}, {}, 'date'), '13-08-1899')
 
+        # _has_changed works correctly with a localized date format
+        input_format = get_format('DATE_INPUT_FORMATS')[0]
+        today = datetime.date.today()
+        today_l10n = today.strftime(input_format)
+        tomorrow = today + datetime.timedelta(days=1)
+        self.assertEqual(w._has_changed(today, today_l10n), False)
+        self.assertEqual(w._has_changed(tomorrow, today_l10n), True)
+
     def test_l10n_invalid_date_in(self):
         # Invalid dates shouldn't be allowed
         a = GetDate({'mydate_month':'2', 'mydate_day':'31', 'mydate_year':'2010'})

django/forms/extras/widgets.py

@@ -134 +134 @@
         s = Select(choices=choices)
         select_html = s.render(field % name, val, local_attrs)
         return select_html
+
+    def _has_changed(self, initial, data):
+        input_format = get_format('DATE_INPUT_FORMATS')[0]
+        data = datetime_safe.datetime.strptime(data, input_format).date()
+        return super(SelectDateWidget, self)._has_changed(initial, data)