mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-03 10:39:12 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #35986 -- Fixed test classes with @translation.override decorator.

Browse Source 
Co-authored-by: Simon Charette <charette.s@gmail.com>
This commit is contained in:
Ahmed Nassar 2025-04-08 09:49:09 +02:00 committed by Sarah Boyce
parent a627829e7b
commit 522dd021b2
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/templatetags/tz.py
View File

@ -1,5 +1,5 @@
import zoneinfo import zoneinfo
from datetime import datetime, tzinfo from datetime import datetime, tzinfo, UTC
from django.template import Library, Node, TemplateSyntaxError from django.template import Library, Node, TemplateSyntaxError
from django.utils import timezone from django.utils import timezone
@ -31,7 +31,7 @@ def utc(value):
""" """
Convert a datetime to UTC. Convert a datetime to UTC.
""" """
return do_timezone(value, datetime.UTC) return do_timezone(value, UTC)
@register.filter("timezone") @register.filter("timezone")

18
tests/forms_tests/tests/test_input_formats.py
View File

@ -118,9 +118,13 @@ class LocalizedTimeTests(SimpleTestCase):
self.assertEqual(text, "13:30:00") self.assertEqual(text, "13:30:00")
@translation.override(None)
@override_settings(TIME_INPUT_FORMATS=["%I:%M:%S %p", "%I:%M %p"]) @override_settings(TIME_INPUT_FORMATS=["%I:%M:%S %p", "%I:%M %p"])
class CustomTimeInputFormatsTests(SimpleTestCase): class CustomTimeInputFormatsTests(SimpleTestCase):
@classmethod
def setUpClass(cls):
cls.enterClassContext(translation.override(None))
super().setUpClass()
def test_timeField(self): def test_timeField(self):
"TimeFields can parse dates in the default format" "TimeFields can parse dates in the default format"
f = forms.TimeField() f = forms.TimeField()
@ -431,9 +435,13 @@ class LocalizedDateTests(SimpleTestCase):
self.assertEqual(text, "21.12.2010") self.assertEqual(text, "21.12.2010")
@translation.override(None)
@override_settings(DATE_INPUT_FORMATS=["%d.%m.%Y", "%d-%m-%Y"]) @override_settings(DATE_INPUT_FORMATS=["%d.%m.%Y", "%d-%m-%Y"])
class CustomDateInputFormatsTests(SimpleTestCase): class CustomDateInputFormatsTests(SimpleTestCase):
@classmethod
def setUpClass(cls):
cls.enterClassContext(translation.override(None))
super().setUpClass()
def test_dateField(self): def test_dateField(self):
"DateFields can parse dates in the default format" "DateFields can parse dates in the default format"
f = forms.DateField() f = forms.DateField()
@ -752,9 +760,13 @@ class LocalizedDateTimeTests(SimpleTestCase):
self.assertEqual(text, "21.12.2010 13:30:00") self.assertEqual(text, "21.12.2010 13:30:00")
@translation.override(None)
@override_settings(DATETIME_INPUT_FORMATS=["%I:%M:%S %p %d/%m/%Y", "%I:%M %p %d-%m-%Y"]) @override_settings(DATETIME_INPUT_FORMATS=["%I:%M:%S %p %d/%m/%Y", "%I:%M %p %d-%m-%Y"])
class CustomDateTimeInputFormatsTests(SimpleTestCase): class CustomDateTimeInputFormatsTests(SimpleTestCase):
@classmethod
def setUpClass(cls):
cls.enterClassContext(translation.override(None))
super().setUpClass()
def test_dateTimeField(self): def test_dateTimeField(self):
"DateTimeFields can parse dates in the default format" "DateTimeFields can parse dates in the default format"
f = forms.DateTimeField() f = forms.DateTimeField()

8
tests/timezones/tests.py
View File

@ -921,9 +921,13 @@ class SerializationTests(SimpleTestCase):
self.assertEqual(obj.dt, dt) self.assertEqual(obj.dt, dt)
@translation.override(None)
@override_settings(DATETIME_FORMAT="c", TIME_ZONE="Africa/Nairobi", USE_TZ=True) @override_settings(DATETIME_FORMAT="c", TIME_ZONE="Africa/Nairobi", USE_TZ=True)
class TemplateTests(SimpleTestCase): class TemplateTests(SimpleTestCase):
@classmethod
def setUpClass(cls):
cls.enterClassContext(translation.override(None))
super().setUpClass()
@requires_tz_support @requires_tz_support
def test_localtime_templatetag_and_filters(self): def test_localtime_templatetag_and_filters(self):
""" """
@ -1324,7 +1328,6 @@ class NewFormsTests(TestCase):
self.assertIn("2011-09-01 17:20:30", str(form)) self.assertIn("2011-09-01 17:20:30", str(form))
@translation.override(None)
@override_settings( @override_settings(
DATETIME_FORMAT="c", DATETIME_FORMAT="c",
TIME_ZONE="Africa/Nairobi", TIME_ZONE="Africa/Nairobi",
@ -1334,6 +1337,7 @@ class NewFormsTests(TestCase):
class AdminTests(TestCase): class AdminTests(TestCase):
@classmethod @classmethod
def setUpTestData(cls): def setUpTestData(cls):
cls.enterClassContext(translation.override(None))
cls.u1 = User.objects.create_user( cls.u1 = User.objects.create_user(
password="secret", password="secret",
last_login=datetime.datetime(2007, 5, 30, 13, 20, 10, tzinfo=UTC), last_login=datetime.datetime(2007, 5, 30, 13, 20, 10, tzinfo=UTC),