summaryrefslogtreecommitdiff
path: root/Modules
diff options
context:
space:
mode:
authorAlexander Belopolsky <alexander.belopolsky@gmail.com>2016-03-25 15:46:55 -0400
committerAlexander Belopolsky <alexander.belopolsky@gmail.com>2016-03-25 15:46:55 -0400
commit16b698b095bfc6cd37b66a58536fb11a6884b557 (patch)
treeb2eecef447ab5e11e5be1678e9f8b504c2e1c99d /Modules
parentd7ac00e6209ae29fbd4c9dd71885c32ad4c7340e (diff)
parent1dcf4f9ee5b60f23291a377353b3dceca7cc9dc9 (diff)
downloadcpython-git-16b698b095bfc6cd37b66a58536fb11a6884b557.tar.gz
merge
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_datetimemodule.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
index 347a9d90dc..261c4bc6e7 100644
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -4753,7 +4753,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);