Commit e69d695c authored by Alexander Belopolsky's avatar Alexander Belopolsky

Issue#26616:Fixed a bug in datetime.astimezone() method.

parent a62eb19d
...@@ -3426,6 +3426,14 @@ class TestDateTimeTZ(TestDateTime, TZInfoBase, unittest.TestCase): ...@@ -3426,6 +3426,14 @@ class TestDateTimeTZ(TestDateTime, TZInfoBase, unittest.TestCase):
self.assertEqual(dt, local) self.assertEqual(dt, local)
self.assertEqual(local.strftime("%z %Z"), "-0400 EDT") self.assertEqual(local.strftime("%z %Z"), "-0400 EDT")
@support.run_with_tz('EST+05EDT,M3.2.0,M11.1.0')
def test_astimezone_default_near_fold(self):
# Issue #26616.
u = datetime(2015, 11, 1, 5, tzinfo=timezone.utc)
t = u.astimezone()
s = t.astimezone()
self.assertEqual(t.tzinfo, s.tzinfo)
def test_aware_subtract(self): def test_aware_subtract(self):
cls = self.theclass cls = self.theclass
......
...@@ -94,6 +94,8 @@ Core and Builtins ...@@ -94,6 +94,8 @@ Core and Builtins
Library Library
------- -------
- Issue #26616: Fixed a bug in datetime.astimezone() method.
- Issue #21925: :func:`warnings.formatwarning` now catches exceptions on - Issue #21925: :func:`warnings.formatwarning` now catches exceptions on
``linecache.getline(...)`` to be able to log :exc:`ResourceWarning` emitted ``linecache.getline(...)`` to be able to log :exc:`ResourceWarning` emitted
late during the Python shutdown process. late during the Python shutdown process.
......
...@@ -4749,7 +4749,12 @@ local_timezone(PyDateTime_DateTime *utc_time) ...@@ -4749,7 +4749,12 @@ local_timezone(PyDateTime_DateTime *utc_time)
PyObject *nameo = NULL; PyObject *nameo = NULL;
const char *zone = NULL; const char *zone = NULL;
delta = datetime_subtract((PyObject *)utc_time, PyDateTime_Epoch); delta = new_delta(ymd_to_ord(GET_YEAR(utc_time), GET_MONTH(utc_time),
GET_DAY(utc_time)) - 719163,
60 * (60 * DATE_GET_HOUR(utc_time) +
DATE_GET_MINUTE(utc_time)) +
DATE_GET_SECOND(utc_time),
0, 0);
if (delta == NULL) if (delta == NULL)
return NULL; return NULL;
one_second = new_delta(0, 1, 0, 0); one_second = new_delta(0, 1, 0, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment