mirror of
https://github.com/django/django.git
synced 2025-10-24 06:06:09 +00:00
Refs #33476 -- Reformatted code with Black.
This commit is contained in:
django-bot
committed by
Mariusz Felisiak
Mariusz Felisiak
parent
f68fa8b45d
commit
9c19aff7c7
@@ -16,9 +16,9 @@ from django.test import SimpleTestCase, ignore_warnings, override_settings
|
||||
from django.utils import timezone
|
||||
from django.utils.deprecation import RemovedInDjango50Warning
|
||||
|
||||
PARIS_ZI = zoneinfo.ZoneInfo('Europe/Paris')
|
||||
EAT = timezone.get_fixed_timezone(180) # Africa/Nairobi
|
||||
ICT = timezone.get_fixed_timezone(420) # Asia/Bangkok
|
||||
PARIS_ZI = zoneinfo.ZoneInfo("Europe/Paris")
|
||||
EAT = timezone.get_fixed_timezone(180) # Africa/Nairobi
|
||||
ICT = timezone.get_fixed_timezone(420) # Asia/Bangkok
|
||||
UTC = datetime.timezone.utc
|
||||
|
||||
HAS_PYTZ = pytz is not None
|
||||
@@ -26,9 +26,9 @@ if not HAS_PYTZ:
|
||||
CET = None
|
||||
PARIS_IMPLS = (PARIS_ZI,)
|
||||
|
||||
needs_pytz = unittest.skip('Test requires pytz')
|
||||
needs_pytz = unittest.skip("Test requires pytz")
|
||||
else:
|
||||
CET = pytz.timezone('Europe/Paris')
|
||||
CET = pytz.timezone("Europe/Paris")
|
||||
PARIS_IMPLS = (PARIS_ZI, CET)
|
||||
|
||||
def needs_pytz(f):
|
||||
@@ -36,7 +36,6 @@ else:
|
||||
|
||||
|
||||
class TimezoneTests(SimpleTestCase):
|
||||
|
||||
def setUp(self):
|
||||
# RemovedInDjango50Warning
|
||||
timezone.get_default_timezone.cache_clear()
|
||||
@@ -62,18 +61,26 @@ class TimezoneTests(SimpleTestCase):
|
||||
|
||||
def test_localdate(self):
|
||||
naive = datetime.datetime(2015, 1, 1, 0, 0, 1)
|
||||
with self.assertRaisesMessage(ValueError, 'localtime() cannot be applied to a naive datetime'):
|
||||
with self.assertRaisesMessage(
|
||||
ValueError, "localtime() cannot be applied to a naive datetime"
|
||||
):
|
||||
timezone.localdate(naive)
|
||||
with self.assertRaisesMessage(ValueError, 'localtime() cannot be applied to a naive datetime'):
|
||||
with self.assertRaisesMessage(
|
||||
ValueError, "localtime() cannot be applied to a naive datetime"
|
||||
):
|
||||
timezone.localdate(naive, timezone=EAT)
|
||||
|
||||
aware = datetime.datetime(2015, 1, 1, 0, 0, 1, tzinfo=ICT)
|
||||
self.assertEqual(timezone.localdate(aware, timezone=EAT), datetime.date(2014, 12, 31))
|
||||
self.assertEqual(
|
||||
timezone.localdate(aware, timezone=EAT), datetime.date(2014, 12, 31)
|
||||
)
|
||||
with timezone.override(EAT):
|
||||
self.assertEqual(timezone.localdate(aware), datetime.date(2014, 12, 31))
|
||||
|
||||
with mock.patch('django.utils.timezone.now', return_value=aware):
|
||||
self.assertEqual(timezone.localdate(timezone=EAT), datetime.date(2014, 12, 31))
|
||||
with mock.patch("django.utils.timezone.now", return_value=aware):
|
||||
self.assertEqual(
|
||||
timezone.localdate(timezone=EAT), datetime.date(2014, 12, 31)
|
||||
)
|
||||
with timezone.override(EAT):
|
||||
self.assertEqual(timezone.localdate(), datetime.date(2014, 12, 31))
|
||||
|
||||
@@ -133,92 +140,128 @@ class TimezoneTests(SimpleTestCase):
|
||||
timezone.deactivate()
|
||||
|
||||
def test_override_string_tz(self):
|
||||
with timezone.override('Asia/Bangkok'):
|
||||
self.assertEqual(timezone.get_current_timezone_name(), 'Asia/Bangkok')
|
||||
with timezone.override("Asia/Bangkok"):
|
||||
self.assertEqual(timezone.get_current_timezone_name(), "Asia/Bangkok")
|
||||
|
||||
def test_override_fixed_offset(self):
|
||||
with timezone.override(datetime.timezone(datetime.timedelta(), 'tzname')):
|
||||
self.assertEqual(timezone.get_current_timezone_name(), 'tzname')
|
||||
with timezone.override(datetime.timezone(datetime.timedelta(), "tzname")):
|
||||
self.assertEqual(timezone.get_current_timezone_name(), "tzname")
|
||||
|
||||
def test_activate_invalid_timezone(self):
|
||||
with self.assertRaisesMessage(ValueError, 'Invalid timezone: None'):
|
||||
with self.assertRaisesMessage(ValueError, "Invalid timezone: None"):
|
||||
timezone.activate(None)
|
||||
|
||||
def test_is_aware(self):
|
||||
self.assertTrue(timezone.is_aware(datetime.datetime(2011, 9, 1, 13, 20, 30, tzinfo=EAT)))
|
||||
self.assertTrue(
|
||||
timezone.is_aware(datetime.datetime(2011, 9, 1, 13, 20, 30, tzinfo=EAT))
|
||||
)
|
||||
self.assertFalse(timezone.is_aware(datetime.datetime(2011, 9, 1, 13, 20, 30)))
|
||||
|
||||
def test_is_naive(self):
|
||||
self.assertFalse(timezone.is_naive(datetime.datetime(2011, 9, 1, 13, 20, 30, tzinfo=EAT)))
|
||||
self.assertFalse(
|
||||
timezone.is_naive(datetime.datetime(2011, 9, 1, 13, 20, 30, tzinfo=EAT))
|
||||
)
|
||||
self.assertTrue(timezone.is_naive(datetime.datetime(2011, 9, 1, 13, 20, 30)))
|
||||
|
||||
def test_make_aware(self):
|
||||
self.assertEqual(
|
||||
timezone.make_aware(datetime.datetime(2011, 9, 1, 13, 20, 30), EAT),
|
||||
datetime.datetime(2011, 9, 1, 13, 20, 30, tzinfo=EAT))
|
||||
datetime.datetime(2011, 9, 1, 13, 20, 30, tzinfo=EAT),
|
||||
)
|
||||
with self.assertRaises(ValueError):
|
||||
timezone.make_aware(datetime.datetime(2011, 9, 1, 13, 20, 30, tzinfo=EAT), EAT)
|
||||
timezone.make_aware(
|
||||
datetime.datetime(2011, 9, 1, 13, 20, 30, tzinfo=EAT), EAT
|
||||
)
|
||||
|
||||
def test_make_naive(self):
|
||||
self.assertEqual(
|
||||
timezone.make_naive(datetime.datetime(2011, 9, 1, 13, 20, 30, tzinfo=EAT), EAT),
|
||||
datetime.datetime(2011, 9, 1, 13, 20, 30))
|
||||
timezone.make_naive(
|
||||
datetime.datetime(2011, 9, 1, 13, 20, 30, tzinfo=EAT), EAT
|
||||
),
|
||||
datetime.datetime(2011, 9, 1, 13, 20, 30),
|
||||
)
|
||||
self.assertEqual(
|
||||
timezone.make_naive(datetime.datetime(2011, 9, 1, 17, 20, 30, tzinfo=ICT), EAT),
|
||||
datetime.datetime(2011, 9, 1, 13, 20, 30))
|
||||
timezone.make_naive(
|
||||
datetime.datetime(2011, 9, 1, 17, 20, 30, tzinfo=ICT), EAT
|
||||
),
|
||||
datetime.datetime(2011, 9, 1, 13, 20, 30),
|
||||
)
|
||||
|
||||
with self.assertRaisesMessage(ValueError, 'make_naive() cannot be applied to a naive datetime'):
|
||||
with self.assertRaisesMessage(
|
||||
ValueError, "make_naive() cannot be applied to a naive datetime"
|
||||
):
|
||||
timezone.make_naive(datetime.datetime(2011, 9, 1, 13, 20, 30), EAT)
|
||||
|
||||
def test_make_naive_no_tz(self):
|
||||
self.assertEqual(
|
||||
timezone.make_naive(datetime.datetime(2011, 9, 1, 13, 20, 30, tzinfo=EAT)),
|
||||
datetime.datetime(2011, 9, 1, 5, 20, 30)
|
||||
datetime.datetime(2011, 9, 1, 5, 20, 30),
|
||||
)
|
||||
|
||||
def test_make_aware_no_tz(self):
|
||||
self.assertEqual(
|
||||
timezone.make_aware(datetime.datetime(2011, 9, 1, 13, 20, 30)),
|
||||
datetime.datetime(2011, 9, 1, 13, 20, 30, tzinfo=timezone.get_fixed_timezone(-300))
|
||||
datetime.datetime(
|
||||
2011, 9, 1, 13, 20, 30, tzinfo=timezone.get_fixed_timezone(-300)
|
||||
),
|
||||
)
|
||||
|
||||
def test_make_aware2(self):
|
||||
CEST = datetime.timezone(datetime.timedelta(hours=2), 'CEST')
|
||||
CEST = datetime.timezone(datetime.timedelta(hours=2), "CEST")
|
||||
for tz in PARIS_IMPLS:
|
||||
with self.subTest(repr(tz)):
|
||||
self.assertEqual(
|
||||
timezone.make_aware(datetime.datetime(2011, 9, 1, 12, 20, 30), tz),
|
||||
datetime.datetime(2011, 9, 1, 12, 20, 30, tzinfo=CEST))
|
||||
datetime.datetime(2011, 9, 1, 12, 20, 30, tzinfo=CEST),
|
||||
)
|
||||
|
||||
if HAS_PYTZ:
|
||||
with self.assertRaises(ValueError):
|
||||
timezone.make_aware(CET.localize(datetime.datetime(2011, 9, 1, 12, 20, 30)), CET)
|
||||
timezone.make_aware(
|
||||
CET.localize(datetime.datetime(2011, 9, 1, 12, 20, 30)), CET
|
||||
)
|
||||
|
||||
with self.assertRaises(ValueError):
|
||||
timezone.make_aware(datetime.datetime(2011, 9, 1, 12, 20, 30, tzinfo=PARIS_ZI), PARIS_ZI)
|
||||
timezone.make_aware(
|
||||
datetime.datetime(2011, 9, 1, 12, 20, 30, tzinfo=PARIS_ZI), PARIS_ZI
|
||||
)
|
||||
|
||||
@needs_pytz
|
||||
def test_make_naive_pytz(self):
|
||||
self.assertEqual(
|
||||
timezone.make_naive(CET.localize(datetime.datetime(2011, 9, 1, 12, 20, 30)), CET),
|
||||
datetime.datetime(2011, 9, 1, 12, 20, 30))
|
||||
timezone.make_naive(
|
||||
CET.localize(datetime.datetime(2011, 9, 1, 12, 20, 30)), CET
|
||||
),
|
||||
datetime.datetime(2011, 9, 1, 12, 20, 30),
|
||||
)
|
||||
self.assertEqual(
|
||||
timezone.make_naive(
|
||||
pytz.timezone("Asia/Bangkok").localize(datetime.datetime(2011, 9, 1, 17, 20, 30)), CET
|
||||
pytz.timezone("Asia/Bangkok").localize(
|
||||
datetime.datetime(2011, 9, 1, 17, 20, 30)
|
||||
),
|
||||
CET,
|
||||
),
|
||||
datetime.datetime(2011, 9, 1, 12, 20, 30))
|
||||
with self.assertRaisesMessage(ValueError, 'make_naive() cannot be applied to a naive datetime'):
|
||||
datetime.datetime(2011, 9, 1, 12, 20, 30),
|
||||
)
|
||||
with self.assertRaisesMessage(
|
||||
ValueError, "make_naive() cannot be applied to a naive datetime"
|
||||
):
|
||||
timezone.make_naive(datetime.datetime(2011, 9, 1, 12, 20, 30), CET)
|
||||
|
||||
def test_make_naive_zoneinfo(self):
|
||||
self.assertEqual(
|
||||
timezone.make_naive(datetime.datetime(2011, 9, 1, 12, 20, 30, tzinfo=PARIS_ZI), PARIS_ZI),
|
||||
datetime.datetime(2011, 9, 1, 12, 20, 30)
|
||||
timezone.make_naive(
|
||||
datetime.datetime(2011, 9, 1, 12, 20, 30, tzinfo=PARIS_ZI), PARIS_ZI
|
||||
),
|
||||
datetime.datetime(2011, 9, 1, 12, 20, 30),
|
||||
)
|
||||
|
||||
self.assertEqual(
|
||||
timezone.make_naive(datetime.datetime(2011, 9, 1, 12, 20, 30, fold=1, tzinfo=PARIS_ZI), PARIS_ZI),
|
||||
datetime.datetime(2011, 9, 1, 12, 20, 30, fold=1)
|
||||
timezone.make_naive(
|
||||
datetime.datetime(2011, 9, 1, 12, 20, 30, fold=1, tzinfo=PARIS_ZI),
|
||||
PARIS_ZI,
|
||||
),
|
||||
datetime.datetime(2011, 9, 1, 12, 20, 30, fold=1),
|
||||
)
|
||||
|
||||
@needs_pytz
|
||||
@@ -244,8 +287,7 @@ class TimezoneTests(SimpleTestCase):
|
||||
dst = timezone.make_aware(ambiguous, timezone=PARIS_ZI)
|
||||
|
||||
self.assertEqual(
|
||||
std.astimezone(UTC) - dst.astimezone(UTC),
|
||||
datetime.timedelta(hours=1)
|
||||
std.astimezone(UTC) - dst.astimezone(UTC), datetime.timedelta(hours=1)
|
||||
)
|
||||
self.assertEqual(std.utcoffset(), datetime.timedelta(hours=1))
|
||||
self.assertEqual(dst.utcoffset(), datetime.timedelta(hours=2))
|
||||
@@ -273,20 +315,21 @@ class TimezoneTests(SimpleTestCase):
|
||||
dst = timezone.make_aware(non_existent.replace(fold=1), PARIS_ZI)
|
||||
|
||||
self.assertEqual(
|
||||
std.astimezone(UTC) - dst.astimezone(UTC),
|
||||
datetime.timedelta(hours=1)
|
||||
std.astimezone(UTC) - dst.astimezone(UTC), datetime.timedelta(hours=1)
|
||||
)
|
||||
self.assertEqual(std.utcoffset(), datetime.timedelta(hours=1))
|
||||
self.assertEqual(dst.utcoffset(), datetime.timedelta(hours=2))
|
||||
|
||||
def test_make_aware_is_dst_deprecation_warning(self):
|
||||
msg = (
|
||||
'The is_dst argument to make_aware(), used by the Trunc() '
|
||||
'database functions and QuerySet.datetimes(), is deprecated as it '
|
||||
'has no effect with zoneinfo time zones.'
|
||||
"The is_dst argument to make_aware(), used by the Trunc() "
|
||||
"database functions and QuerySet.datetimes(), is deprecated as it "
|
||||
"has no effect with zoneinfo time zones."
|
||||
)
|
||||
with self.assertRaisesMessage(RemovedInDjango50Warning, msg):
|
||||
timezone.make_aware(datetime.datetime(2011, 9, 1, 13, 20, 30), EAT, is_dst=True)
|
||||
timezone.make_aware(
|
||||
datetime.datetime(2011, 9, 1, 13, 20, 30), EAT, is_dst=True
|
||||
)
|
||||
|
||||
def test_get_timezone_name(self):
|
||||
"""
|
||||
@@ -297,24 +340,27 @@ class TimezoneTests(SimpleTestCase):
|
||||
"""
|
||||
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'),
|
||||
(datetime.timezone(datetime.timedelta(hours=10)), "UTC+10:00"),
|
||||
(
|
||||
datetime.timezone(datetime.timedelta(hours=10), name="Etc/GMT-10"),
|
||||
"Etc/GMT-10",
|
||||
),
|
||||
# zoneinfo, named and fixed offset.
|
||||
(zoneinfo.ZoneInfo('Europe/Madrid'), 'Europe/Madrid'),
|
||||
(zoneinfo.ZoneInfo('Etc/GMT-10'), '+10'),
|
||||
(zoneinfo.ZoneInfo("Europe/Madrid"), "Europe/Madrid"),
|
||||
(zoneinfo.ZoneInfo("Etc/GMT-10"), "+10"),
|
||||
]
|
||||
if HAS_PYTZ:
|
||||
tests += [
|
||||
# pytz, named and fixed offset.
|
||||
(pytz.timezone('Europe/Madrid'), 'Europe/Madrid'),
|
||||
(pytz.timezone('Etc/GMT-10'), '+10'),
|
||||
(pytz.timezone("Europe/Madrid"), "Europe/Madrid"),
|
||||
(pytz.timezone("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')
|
||||
self.assertEqual(timezone.get_default_timezone_name(), "America/Chicago")
|
||||
|
||||
def test_fixedoffset_timedelta(self):
|
||||
delta = datetime.timedelta(hours=1)
|
||||
|
||||
Reference in New Issue
Block a user