diff options
| author | R David Murray <rdmurray@bitdance.com> | 2012-08-23 01:34:00 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2012-08-23 01:34:00 (GMT) |
| commit | b8687df6532b809f41d77dfc617363d3c093ec88 (patch) | |
| tree | 48e09484522d82be90843fe16584126f41a63116 /Lib/test/test_email | |
| parent | 17183a2972e8981c0d0ca2d599b6e08fc662fc28 (diff) | |
| download | cpython-b8687df6532b809f41d77dfc617363d3c093ec88.zip cpython-b8687df6532b809f41d77dfc617363d3c093ec88.tar.gz cpython-b8687df6532b809f41d77dfc617363d3c093ec88.tar.bz2 | |
#665194: Update email.utils.localtime to use astimezone, and fix bug.
The new code correctly handles historic changes in UTC offsets.
A test for this should follow.
Original patch by Alexander Belopolsky.
Diffstat (limited to 'Lib/test/test_email')
| -rw-r--r-- | Lib/test/test_email/test_utils.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Lib/test/test_email/test_utils.py b/Lib/test/test_email/test_utils.py index d9c4d70..7d0267e 100644 --- a/Lib/test/test_email/test_utils.py +++ b/Lib/test/test_email/test_utils.py @@ -87,17 +87,23 @@ class LocaltimeTests(unittest.TestCase): t2 = utils.localtime(t1) self.assertEqual(t1, t2) + @test.support.run_with_tz('EST+05EDT,M3.2.0,M11.1.0') def test_localtime_epoch_utc_daylight_true(self): test.support.patch(self, time, 'daylight', True) t0 = datetime.datetime(1970, 1, 1, tzinfo = datetime.timezone.utc) t1 = utils.localtime(t0) - self.assertEqual(t0, t1) + t2 = t0 - datetime.timedelta(hours=5) + t2 = t2.replace(tzinfo = datetime.timezone(datetime.timedelta(hours=-5))) + self.assertEqual(t1, t2) + @test.support.run_with_tz('EST+05EDT,M3.2.0,M11.1.0') def test_localtime_epoch_utc_daylight_false(self): test.support.patch(self, time, 'daylight', False) t0 = datetime.datetime(1970, 1, 1, tzinfo = datetime.timezone.utc) t1 = utils.localtime(t0) - self.assertEqual(t0, t1) + t2 = t0 - datetime.timedelta(hours=5) + t2 = t2.replace(tzinfo = datetime.timezone(datetime.timedelta(hours=-5))) + self.assertEqual(t1, t2) def test_localtime_epoch_notz_daylight_true(self): test.support.patch(self, time, 'daylight', True) |