diff options
| author | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2016-03-25 19:42:59 (GMT) |
|---|---|---|
| committer | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2016-03-25 19:42:59 (GMT) |
| commit | 1dcf4f9ee5b60f23291a377353b3dceca7cc9dc9 (patch) | |
| tree | 12df3e33f597e65096dbe0e532e3c88517928f36 | |
| parent | 84ca9fe14533d7fca2cf5c18d3cba3e72c8204ae (diff) | |
| download | cpython-1dcf4f9ee5b60f23291a377353b3dceca7cc9dc9.zip cpython-1dcf4f9ee5b60f23291a377353b3dceca7cc9dc9.tar.gz cpython-1dcf4f9ee5b60f23291a377353b3dceca7cc9dc9.tar.bz2 | |
Issue#26616:Fixed a bug in datetime.astimezone() method.
| -rw-r--r-- | Lib/test/datetimetester.py | 8 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/_datetimemodule.c | 7 |
3 files changed, 16 insertions, 1 deletions
diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py index 7743c67..b907164 100644 --- a/Lib/test/datetimetester.py +++ b/Lib/test/datetimetester.py @@ -3426,6 +3426,14 @@ class TestDateTimeTZ(TestDateTime, TZInfoBase, unittest.TestCase): self.assertEqual(dt, local) 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): cls = self.theclass @@ -94,6 +94,8 @@ Core and Builtins Library ------- +- Issue #26616: Fixed a bug in datetime.astimezone() method. + - Issue #21925: :func:`warnings.formatwarning` now catches exceptions on ``linecache.getline(...)`` to be able to log :exc:`ResourceWarning` emitted late during the Python shutdown process. diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c index e3de537..0e50023 100644 --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -4749,7 +4749,12 @@ local_timezone(PyDateTime_DateTime *utc_time) PyObject *nameo = 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) return NULL; one_second = new_delta(0, 1, 0, 0); |