summaryrefslogtreecommitdiff
path: root/msgpack
diff options
context:
space:
mode:
authorPeter Fischer <yanlend@users.noreply.github.com>2020-07-30 16:48:51 +0200
committerGitHub <noreply@github.com>2020-07-30 23:48:51 +0900
commit8fb709f2e0438862020d8810fa70a81fb5dac7d4 (patch)
tree69c53d33afbc788149b99fe89a7784d7a85e79a6 /msgpack
parent772c830841a276adb392dd449809764b2826b1f8 (diff)
downloadmsgpack-python-8fb709f2e0438862020d8810fa70a81fb5dac7d4.tar.gz
Fix datetime before epoch on windows in cython implementation (#436)
Cython implementation still used datetime.from_timestamp method, which does not work on windows. Update the cython implementation to use utc time and delta and add a regression test to highlight the issue.
Diffstat (limited to 'msgpack')
-rw-r--r--msgpack/unpack.h34
1 files changed, 21 insertions, 13 deletions
diff --git a/msgpack/unpack.h b/msgpack/unpack.h
index debdf71..868b96e 100644
--- a/msgpack/unpack.h
+++ b/msgpack/unpack.h
@@ -341,7 +341,26 @@ static int unpack_callback_ext(unpack_user* u, const char* base, const char* pos
else if (u->timestamp == 0) { // Timestamp
py = PyObject_CallFunction(u->timestamp_t, "(Lk)", ts.tv_sec, ts.tv_nsec);
}
- else { // float or datetime
+ else if (u->timestamp == 3) { // datetime
+ // Calculate datetime using epoch + delta
+ // due to limitations PyDateTime_FromTimestamp on Windows with negative timestamps
+ PyObject *epoch = PyDateTimeAPI->DateTime_FromDateAndTime(1970, 1, 1, 0, 0, 0, 0, u->utc, PyDateTimeAPI->DateTimeType);
+ if (epoch == NULL) {
+ return -1;
+ }
+
+ PyObject* d = PyDelta_FromDSU(0, ts.tv_sec, ts.tv_nsec / 1000);
+ if (d == NULL) {
+ Py_DECREF(epoch);
+ return -1;
+ }
+
+ py = PyNumber_Add(epoch, d);
+
+ Py_DECREF(epoch);
+ Py_DECREF(d);
+ }
+ else { // float
PyObject *a = PyFloat_FromDouble((double)ts.tv_nsec);
if (a == NULL) return -1;
@@ -358,18 +377,7 @@ static int unpack_callback_ext(unpack_user* u, const char* base, const char* pos
a = PyNumber_Add(b, c);
Py_DECREF(b);
Py_DECREF(c);
-
- if (u->timestamp == 3) { // datetime
- PyObject *t = PyTuple_Pack(2, a, u->utc);
- Py_DECREF(a);
- if (t == NULL) {
- return -1;
- }
- py = PyDateTime_FromTimestamp(t);
- Py_DECREF(t);
- } else { // float
- py = a;
- }
+ py = a;
}
} else {
py = PyObject_CallFunction(u->ext_hook, "(iy#)", (int)typecode, pos, (Py_ssize_t)length-1);