Handle "today" and "now" in cython instead of C

pandas/_libs/src/datetime/np_datetime.c

@@ -527,7 +527,7 @@ void pandas_datetime_to_datetimestruct(npy_datetime val, PANDAS_DATETIMEUNIT fr,
 void pandas_timedelta_to_timedeltastruct(npy_timedelta val,
                                          PANDAS_DATETIMEUNIT fr,
                                          pandas_timedeltastruct *result) {
-  convert_timedelta_to_timedeltastruct(fr, val, result);
+    convert_timedelta_to_timedeltastruct(fr, val, result);
 }
 
 

pandas/_libs/src/datetime/np_datetime_strings.c

@@ -33,55 +33,6 @@ This file implements string parsing and creation for NumPy datetime.
 #include "np_datetime_strings.h"
 
 
-/* Platform-specific time_t typedef */
-typedef time_t NPY_TIME_T;
-
-/*
- * Wraps `localtime` functionality for multiple platforms. This
- * converts a time value to a time structure in the local timezone.
- *
- * Returns 0 on success, -1 on failure.
- */
-static int get_localtime(NPY_TIME_T *ts, struct tm *tms) {
-    char *func_name = "<unknown>";
-#if defined(_WIN32)
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
-    if (localtime_s(tms, ts) != 0) {
-        func_name = "localtime_s";
-        goto fail;
-    }
-#elif defined(__GNUC__) && defined(NPY_MINGW_USE_CUSTOM_MSVCR)
-    if (_localtime64_s(tms, ts) != 0) {
-        func_name = "_localtime64_s";
-        goto fail;
-    }
-#else
-    struct tm *tms_tmp;
-    localtime_r(ts, tms_tmp);
-    if (tms_tmp == NULL) {
-        func_name = "localtime";
-        goto fail;
-    }
-    memcpy(tms, tms_tmp, sizeof(struct tm));
-#endif
-#else
-    if (localtime_r(ts, tms) == NULL) {
-        func_name = "localtime_r";
-        goto fail;
-    }
-#endif
-
-    return 0;
-
-fail:
-    PyErr_Format(PyExc_OSError,
-                 "Failed to use '%s' to convert "
-                 "to a local time",
-                 func_name);
-    return -1;
-}
-
-
 /*
  * Parses (almost) standard ISO 8601 date strings. The differences are:
  *
@@ -138,59 +89,6 @@ int parse_iso_8601_datetime(char *str, int len,
     out->month = 1;
     out->day = 1;
 
-    /*
-     * The string "today" means take today's date in local time, and
-     * convert it to a date representation. This date representation, if
-     * forced into a time unit, will be at midnight UTC.
-     * This is perhaps a little weird, but done so that the
-     * 'datetime64[D]' type produces the date you expect, rather than
-     * switching to an adjacent day depending on the current time and your
-     * timezone.
-     */
-    if (len == 5 && tolower(str[0]) == 't' && tolower(str[1]) == 'o' &&
-        tolower(str[2]) == 'd' && tolower(str[3]) == 'a' &&
-        tolower(str[4]) == 'y') {
-        NPY_TIME_T rawtime = 0;
-        struct tm tm_;
-
-        time(&rawtime);
-        if (get_localtime(&rawtime, &tm_) < 0) {
-            return -1;
-        }
-        out->year = tm_.tm_year + 1900;
-        out->month = tm_.tm_mon + 1;
-        out->day = tm_.tm_mday;
-
-        /*
-         * Indicate that this was a special value, and
-         * is a date (unit 'D').
-         */
-        if (out_local != NULL) {
-            *out_local = 0;
-        }
-
-        return 0;
-    }
-
-    /* The string "now" resolves to the current UTC time */
-    if (len == 3 && tolower(str[0]) == 'n' && tolower(str[1]) == 'o' &&
-        tolower(str[2]) == 'w') {
-        NPY_TIME_T rawtime = 0;
-
-        time(&rawtime);
-
-        /*
-         * Indicate that this was a special value, and
-         * use 's' because the time() function has resolution
-         * seconds.
-         */
-        if (out_local != NULL) {
-            *out_local = 0;
-        }
-
-        return convert_datetime_to_datetimestruct(PANDAS_FR_s, rawtime, out);
-    }
-
     substr = str;
     sublen = len;
 

pandas/_libs/tslib.pyx

@@ -10,7 +10,8 @@ import numpy as np
 np.import_array()
 
 
-from cpython cimport PyTypeObject, PyFloat_Check
+from cpython cimport (PyTypeObject, PyFloat_Check,
+                      PyUnicode_Check, PyUnicode_AsASCIIString)
 
 cdef extern from "Python.h":
     cdef PyTypeObject *Py_TYPE(object)
@@ -223,6 +224,14 @@ def _test_parse_iso8601(object ts):
 
     obj = _TSObject()
 
+    if PyUnicode_Check(ts):
+        ts = PyUnicode_AsASCIIString(ts)
+
+    if ts == b'now':
+        return Timestamp.utcnow()
+    elif ts == b'today':
+        return Timestamp.utcnow().normalize()
+
     _string_to_dts(ts, &obj.dts, &out_local, &out_tzoffset)
     obj.value = dtstruct_to_dt64(&obj.dts)
     check_dts_bounds(&obj.dts)
@@ -603,12 +612,25 @@ cpdef array_to_datetime(ndarray[object] values, errors='raise',
             elif is_string_object(val):
                 # string
 
-                try:
-                    if len(val) == 0 or val in nat_strings:
-                        iresult[i] = NPY_NAT
-                        continue
+                if len(val) == 0 or val in nat_strings:
+                    iresult[i] = NPY_NAT
+                    continue
+
+                seen_string = 1
 
-                    seen_string = 1
+                if PyUnicode_Check(val):
+                    val = PyUnicode_AsASCIIString(val)
+
+                if val == b'now':
+                    # Note: this is *not* the same as Timestamp('now')
+                    iresult[i] = Timestamp.utcnow().value
+                    continue
+                elif val == b'today':
+                    # Note: this is *not* the same as Timestamp('today')
+                    iresult[i] = Timestamp.utcnow().normalize().value
+                    continue
+
+                try:
                     _string_to_dts(val, &dts, &out_local, &out_tzoffset)
                     value = dtstruct_to_dt64(&dts)
                     if out_local == 1: