Skip to content

Commit f46c33e

Browse files
committed
Fixed TestDefaultTZDateTimeField to allow multiple tzinfo implementations.
zoneinfo was made the default time zone implementation in django/django@306607d.
1 parent 19b6091 commit f46c33e

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

tests/test_fields.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1464,15 +1464,24 @@ def setup_class(cls):
14641464
cls.field = serializers.DateTimeField()
14651465
cls.kolkata = pytz.timezone('Asia/Kolkata')
14661466

1467+
def assertUTC(self, tzinfo):
1468+
"""
1469+
Check UTC for datetime.timezone, ZoneInfo, and pytz tzinfo instances.
1470+
"""
1471+
assert (
1472+
tzinfo is utc or
1473+
(getattr(tzinfo, "key", None) or getattr(tzinfo, "zone", None)) == "UTC"
1474+
)
1475+
14671476
def test_default_timezone(self):
1468-
assert self.field.default_timezone() == utc
1477+
self.assertUTC(self.field.default_timezone())
14691478

14701479
def test_current_timezone(self):
1471-
assert self.field.default_timezone() == utc
1480+
self.assertUTC(self.field.default_timezone())
14721481
activate(self.kolkata)
14731482
assert self.field.default_timezone() == self.kolkata
14741483
deactivate()
1475-
assert self.field.default_timezone() == utc
1484+
self.assertUTC(self.field.default_timezone())
14761485

14771486

14781487
@pytest.mark.skipif(pytz is None, reason='pytz not installed')

0 commit comments

Comments
 (0)