summaryrefslogtreecommitdiff
path: root/Modules/_datetimemodule.c
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-06-22 21:13:34 +0200
committerAntoine Pitrou <solipsis@pitrou.net>2012-06-22 21:13:34 +0200
commit5f6213be2d5890d7bc3ba62db58ac1ce0215aaaa (patch)
treee818110e6015c9666cac9d1d3107ca656719811a /Modules/_datetimemodule.c
parentf7338f65fb8bdb85c52dc54d06d003a82a06bbb3 (diff)
parent49526f48fc73d3ccdf09d466ed2d39a30e4df9b9 (diff)
downloadcpython-git-5f6213be2d5890d7bc3ba62db58ac1ce0215aaaa.tar.gz
Merge
Diffstat (limited to 'Modules/_datetimemodule.c')
-rw-r--r--Modules/_datetimemodule.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
index db6156c150..149f573c69 100644
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -4754,7 +4754,7 @@ local_timezone(PyDateTime_DateTime *utc_time)
return result;
}
-static PyObject *
+static PyDateTime_DateTime *
datetime_astimezone(PyDateTime_DateTime *self, PyObject *args, PyObject *kw)
{
PyDateTime_DateTime *result;
@@ -4777,7 +4777,7 @@ datetime_astimezone(PyDateTime_DateTime *self, PyObject *args, PyObject *kw)
/* Conversion to self's own time zone is a NOP. */
if (self->tzinfo == tzinfo) {
Py_INCREF(self);
- return (PyObject *)self;
+ return self;
}
/* Convert self to UTC. */
@@ -4814,10 +4814,11 @@ datetime_astimezone(PyDateTime_DateTime *self, PyObject *args, PyObject *kw)
Py_DECREF(temp);
temp = (PyObject *)result;
- result = _PyObject_CallMethodId(tzinfo, &PyId_fromutc, "O", temp);
+ result = (PyDateTime_DateTime *)
+ _PyObject_CallMethodId(tzinfo, &PyId_fromutc, "O", temp);
Py_DECREF(temp);
- return (PyObject *)result;
+ return result;
}
static PyObject *