mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 21:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Issue #9527: tm_gmtoff has 'correct' sign.

Browse source
This commit is contained in:
Alexander Belopolsky 2012-06-22 16:04:19 -04:00
parent 5f6213be2d
commit 93c9cd07b6
4 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Modules/_datetimemodule.c
View file

@ -4717,12 +4717,8 @@ local_timezone(PyDateTime_DateTime *utc_time)
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 @@ local_timezone(PyDateTime_DateTime *utc_time)
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)