Issue #9527: Fixes for platforms without tm_zone
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
index f28d03c..db6156c 100644
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -809,14 +809,16 @@
}
if (GET_TD_MICROSECONDS(offset) != 0 || GET_TD_SECONDS(offset) % 60 != 0) {
PyErr_Format(PyExc_ValueError, "offset must be a timedelta"
- " representing a whole number of minutes");
+ " representing a whole number of minutes,"
+ " not %R.", offset);
return NULL;
}
if ((GET_TD_DAYS(offset) == -1 && GET_TD_SECONDS(offset) == 0) ||
GET_TD_DAYS(offset) < -1 || GET_TD_DAYS(offset) >= 1) {
PyErr_Format(PyExc_ValueError, "offset must be a timedelta"
" strictly between -timedelta(hours=24) and"
- " timedelta(hours=24).");
+ " timedelta(hours=24),"
+ " not %R.", offset);
return NULL;
}
@@ -4686,12 +4688,11 @@
}
static PyObject *
-local_timezone(PyObject *utc_time)
+local_timezone(PyDateTime_DateTime *utc_time)
{
PyObject *result = NULL;
struct tm *timep;
time_t timestamp;
- long offset;
PyObject *delta;
PyObject *one_second;
PyObject *seconds;
@@ -4716,21 +4717,22 @@
return NULL;
timep = localtime(×tamp);
#ifdef HAVE_STRUCT_TM_TM_ZONE
- offset = timep->tm_gmtoff;
- zone = timep->tm_zone;
- delta = new_delta(0, -offset, 0, 0);
+ {
+ long offset;
+ offset = timep->tm_gmtoff;
+ zone = timep->tm_zone;
+ delta = new_delta(0, -offset, 0, 0);
+ }
#else /* HAVE_STRUCT_TM_TM_ZONE */
{
PyObject *local_time;
- Py_INCREF(utc_time->tzinfo);
local_time = new_datetime(timep->tm_year + 1900, timep->tm_mon + 1,
timep->tm_mday, timep->tm_hour, timep->tm_min,
- timep->tm_sec, utc_time->tzinfo);
- if (local_time == NULL) {
- Py_DECREF(utc_time->tzinfo);
+ timep->tm_sec, DATE_GET_MICROSECOND(utc_time),
+ utc_time->tzinfo);
+ if (local_time == NULL)
goto error;
- }
- delta = datetime_subtract(local_time, utc_time);
+ delta = datetime_subtract((PyObject*)utc_time, local_time);
/* XXX: before relying on tzname, we should compare delta
to the offset implied by timezone/altzone */
if (daylight && timep->tm_isdst >= 0)
@@ -4755,7 +4757,7 @@
static PyObject *
datetime_astimezone(PyDateTime_DateTime *self, PyObject *args, PyObject *kw)
{
- PyObject *result;
+ PyDateTime_DateTime *result;
PyObject *offset;
PyObject *temp;
PyObject *tzinfo = Py_None;
@@ -4791,14 +4793,14 @@
}
/* result = self - offset */
- result = add_datetime_timedelta(self,
- (PyDateTime_Delta *)offset, -1);
+ result = (PyDateTime_DateTime *)add_datetime_timedelta(self,
+ (PyDateTime_Delta *)offset, -1);
Py_DECREF(offset);
if (result == NULL)
return NULL;
/* Attach new tzinfo and let fromutc() do the rest. */
- temp = ((PyDateTime_DateTime *)result)->tzinfo;
+ temp = result->tzinfo;
if (tzinfo == Py_None) {
tzinfo = local_timezone(result);
if (tzinfo == NULL) {
@@ -4808,14 +4810,14 @@
}
else
Py_INCREF(tzinfo);
- ((PyDateTime_DateTime *)result)->tzinfo = tzinfo;
+ result->tzinfo = tzinfo;
Py_DECREF(temp);
- temp = result;
+ temp = (PyObject *)result;
result = _PyObject_CallMethodId(tzinfo, &PyId_fromutc, "O", temp);
Py_DECREF(temp);
- return result;
+ return (PyObject *)result;
}
static PyObject *