mirrors/django
mirrors/django
0
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-11-22 11:57:34 +01:00
Code Issues Releases Wiki Activity

Fixed #32992 -- Restored offset extraction for fixed offset timezones.

Browse Source 
Regression in 10d1261984.
This commit is contained in:
Carlton Gibson 2021-08-24 11:21:32 +02:00 committed by Mariusz Felisiak
parent d89f976bdd
commit cbba49971b
3 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/utils/timezone.py
View File

@ -72,8 +72,11 @@ def get_current_timezone_name():
def _get_timezone_name(timezone):
"""Return the name of ``timezone``."""
return str(timezone)
"""
Return the offset for fixed offset timezones, or the name of timezone if
not set.
"""
return timezone.tzname(None) or str(timezone)
# Timezone selection functions.

3
docs/releases/3.2.7.txt
View File

@ -9,4 +9,5 @@ Django 3.2.7 fixes several bugs in 3.2.6.
Bugfixes
========
* ...
* Fixed a regression in Django 3.2 that caused the incorrect offset extraction
from fixed offset timezones (:ticket:`32992`).

25
tests/utils_tests/test_timezone.py
View File

@ -260,6 +260,31 @@ class TimezoneTests(SimpleTestCase):
self.assertEqual(std.utcoffset(), datetime.timedelta(hours=1))
self.assertEqual(dst.utcoffset(), datetime.timedelta(hours=2))
def test_get_timezone_name(self):
"""
The _get_timezone_name() helper must return the offset for fixed offset
timezones, for usage with Trunc DB functions.
The datetime.timezone examples show the current behavior.
"""
tests = [
# datetime.timezone, fixed offset with and without `name`.
(datetime.timezone(datetime.timedelta(hours=10)), 'UTC+10:00'),
(datetime.timezone(datetime.timedelta(hours=10), name='Etc/GMT-10'), 'Etc/GMT-10'),
# pytz, named and fixed offset.
(pytz.timezone('Europe/Madrid'), 'Europe/Madrid'),
(pytz.timezone('Etc/GMT-10'), '+10'),
]
if HAS_ZONEINFO:
tests += [
# zoneinfo, named and fixed offset.
(zoneinfo.ZoneInfo('Europe/Madrid'), 'Europe/Madrid'),
(zoneinfo.ZoneInfo('Etc/GMT-10'), '+10'),
]
for tz, expected in tests:
with self.subTest(tz=tz, expected=expected):
self.assertEqual(timezone._get_timezone_name(tz), expected)
def test_get_default_timezone(self):
self.assertEqual(timezone.get_default_timezone_name(), 'America/Chicago')