commit 93c9cd07b62371b99f712e41c7bec71dad1c86ec
author Alexander Belopolsky <alexander.belopolsky@gmail.com> Fri Jun 22 16:04:19 2012 -0400
committer Alexander Belopolsky <alexander.belopolsky@gmail.com> Fri Jun 22 16:04:19 2012 -0400
tree d5520f9b0be4534110efc60ffb5379a74fedc3ad
parent 5f6213be2d5890d7bc3ba62db58ac1ce0215aaaa

Issue #9527: tm_gmtoff has 'correct' sign.

Modules/_datetimemodule.c

diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
index 149f573..6df5c03 100644
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -4717,12 +4717,8 @@
         return NULL;
     timep = localtime(&timestamp);
 #ifdef HAVE_STRUCT_TM_TM_ZONE
-    {
-        long offset;
-        offset = timep->tm_gmtoff;
-        zone = timep->tm_zone;
-        delta = new_delta(0, -offset, 0, 0);
-    }
+    zone = timep->tm_zone;
+    delta = new_delta(0, timep->tm_gmtoff, 0, 1);
 #else /* HAVE_STRUCT_TM_TM_ZONE */
     {
         PyObject *local_time;
@@ -4732,7 +4728,7 @@
                                   utc_time->tzinfo);
         if (local_time == NULL)
             goto error;
-        delta = datetime_subtract((PyObject*)utc_time, local_time);
+        delta = datetime_subtract(local_time, (PyObject*)utc_time);
         /* XXX: before relying on tzname, we should compare delta
            to the offset implied by timezone/altzone */
         if (daylight && timep->tm_isdst >= 0)