diff options
Diffstat (limited to 'tests/forms_tests/widget_tests')
| -rw-r--r-- | tests/forms_tests/widget_tests/test_datetimeinput.py | 35 | ||||
| -rw-r--r-- | tests/forms_tests/widget_tests/test_selectdatewidget.py | 47 |
2 files changed, 21 insertions, 61 deletions
diff --git a/tests/forms_tests/widget_tests/test_datetimeinput.py b/tests/forms_tests/widget_tests/test_datetimeinput.py index 9871a66b36..2a9cfdf599 100644 --- a/tests/forms_tests/widget_tests/test_datetimeinput.py +++ b/tests/forms_tests/widget_tests/test_datetimeinput.py @@ -1,9 +1,7 @@ from datetime import datetime from django.forms import CharField, DateTimeInput, Form -from django.test import ignore_warnings from django.utils import translation -from django.utils.deprecation import RemovedInDjango50Warning from .base import WidgetTest @@ -65,39 +63,6 @@ class DateTimeInputTest(WidgetTest): html=('<input type="text" name="date" value="17.09.2007 12:51:34">'), ) - @translation.override("de-at") - def test_locale_aware(self): - d = datetime(2007, 9, 17, 12, 51, 34, 482548) - # RemovedInDjango50Warning: When the deprecation ends, remove - # @ignore_warnings and USE_L10N=False. The assertion should remain - # because format-related settings will take precedence over - # locale-dictated formats. - with ignore_warnings(category=RemovedInDjango50Warning): - with self.settings(USE_L10N=False): - with self.settings( - DATETIME_INPUT_FORMATS=[ - "%Y-%m-%d %H:%M:%S", - "%Y-%m-%d %H:%M:%S.%f", - "%Y-%m-%d %H:%M", - ] - ): - self.check_html( - self.widget, - "date", - d, - html=( - '<input type="text" name="date" ' - 'value="2007-09-17 12:51:34">' - ), - ) - with translation.override("es"): - self.check_html( - self.widget, - "date", - d, - html='<input type="text" name="date" value="17/09/2007 12:51:34">', - ) - def test_fieldset(self): class TestForm(Form): template_name = "forms_tests/use_fieldset.html" diff --git a/tests/forms_tests/widget_tests/test_selectdatewidget.py b/tests/forms_tests/widget_tests/test_selectdatewidget.py index cc1b6918eb..cfcd037987 100644 --- a/tests/forms_tests/widget_tests/test_selectdatewidget.py +++ b/tests/forms_tests/widget_tests/test_selectdatewidget.py @@ -1,10 +1,9 @@ from datetime import date from django.forms import DateField, Form, SelectDateWidget -from django.test import ignore_warnings, override_settings +from django.test import override_settings from django.utils import translation from django.utils.dates import MONTHS_AP -from django.utils.deprecation import RemovedInDjango50Warning from .base import WidgetTest @@ -542,32 +541,28 @@ class SelectDateWidgetTest(WidgetTest): "13-08-0001", ) - # RemovedInDjango50Warning: When the deprecation ends, remove - # @ignore_warnings and USE_L10N=False. The test should remain because - # format-related settings will take precedence over locale-dictated - # formats. - @ignore_warnings(category=RemovedInDjango50Warning) - @override_settings(USE_L10N=False, DATE_INPUT_FORMATS=["%d.%m.%Y"]) + @override_settings(DATE_INPUT_FORMATS=["%d.%m.%Y"]) def test_custom_input_format(self): w = SelectDateWidget(years=("0001", "1899", "2009", "2010")) - for values, expected_value in ( - (("0001", "8", "13"), "13.08.0001"), - (("1899", "7", "11"), "11.07.1899"), - (("2009", "3", "7"), "07.03.2009"), - ): - with self.subTest(values=values): - data = { - "field_%s" % field: value - for field, value in zip(("year", "month", "day"), values) - } - self.assertEqual( - w.value_from_datadict(data, {}, "field"), expected_value - ) - expected_dict = { - field: int(value) - for field, value in zip(("year", "month", "day"), values) - } - self.assertEqual(w.format_value(expected_value), expected_dict) + with translation.override(None): + for values, expected_value in ( + (("0001", "8", "13"), "13.08.0001"), + (("1899", "7", "11"), "11.07.1899"), + (("2009", "3", "7"), "07.03.2009"), + ): + with self.subTest(values=values): + data = { + "field_%s" % field: value + for field, value in zip(("year", "month", "day"), values) + } + self.assertEqual( + w.value_from_datadict(data, {}, "field"), expected_value + ) + expected_dict = { + field: int(value) + for field, value in zip(("year", "month", "day"), values) + } + self.assertEqual(w.format_value(expected_value), expected_dict) def test_format_value(self): valid_formats = [ |