From ed1db957ff9b50e44eeff05dd0813fd4a3afa2cc Mon Sep 17 00:00:00 2001 From: mattip Date: Thu, 24 Nov 2016 19:54:33 +0200 Subject: [PATCH] CLN: move assignment from header into cython --- pandas/src/datetime.pxd | 3 --- pandas/src/datetime_helper.h | 5 ----- pandas/tslib.pyx | 3 ++- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/pandas/src/datetime.pxd b/pandas/src/datetime.pxd index 5f7de8244d17e..3f0e6a563d66b 100644 --- a/pandas/src/datetime.pxd +++ b/pandas/src/datetime.pxd @@ -42,9 +42,6 @@ cdef extern from "datetime.h": object PyDateTime_FromDateAndTime(int year, int month, int day, int hour, int minute, int second, int us) -cdef extern from "datetime_helper.h": - void mangle_nat(object o) - cdef extern from "numpy/ndarrayobject.h": ctypedef int64_t npy_timedelta diff --git a/pandas/src/datetime_helper.h b/pandas/src/datetime_helper.h index d78e91e747854..11399181fa4e7 100644 --- a/pandas/src/datetime_helper.h +++ b/pandas/src/datetime_helper.h @@ -7,11 +7,6 @@ #define PyInt_AS_LONG PyLong_AsLong #endif -void mangle_nat(PyObject *val) { - PyDateTime_GET_MONTH(val) = -1; - PyDateTime_GET_DAY(val) = -1; -} - npy_int64 get_long_attr(PyObject *o, const char *attr) { npy_int64 long_val; PyObject *value = PyObject_GetAttrString(o, attr); diff --git a/pandas/tslib.pyx b/pandas/tslib.pyx index bab45595cd60f..edc2d8d2e4d75 100644 --- a/pandas/tslib.pyx +++ b/pandas/tslib.pyx @@ -738,7 +738,8 @@ class NaTType(_NaT): cdef _NaT base base = _NaT.__new__(cls, 1, 1, 1) - mangle_nat(base) + base._day = -1 + base._month = -1 base.value = NPY_NAT return base