From 09736e54cad2a0fba130383fbf61762bf1bb1f70 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Mon, 30 Apr 2012 17:29:53 -0700 Subject: [PATCH] BUG: work around missing NPY_FR_B in numpy 1.7 --- pandas/src/np_datetime_strings.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pandas/src/np_datetime_strings.c b/pandas/src/np_datetime_strings.c index 5382fd8e4c694..1224ce16c953c 100644 --- a/pandas/src/np_datetime_strings.c +++ b/pandas/src/np_datetime_strings.c @@ -926,31 +926,44 @@ get_datetime_iso_8601_strlen(int local, NPY_DATETIMEUNIT base) /* return 4;*/ case NPY_FR_as: len += 3; /* "###" */ + break; case NPY_FR_fs: len += 3; /* "###" */ + break; case NPY_FR_ps: len += 3; /* "###" */ + break; case NPY_FR_ns: len += 3; /* "###" */ + break; case NPY_FR_us: len += 3; /* "###" */ + break; case NPY_FR_ms: len += 4; /* ".###" */ + break; case NPY_FR_s: len += 3; /* ":##" */ + break; case NPY_FR_m: len += 3; /* ":##" */ + break; case NPY_FR_h: len += 3; /* "T##" */ + break; case NPY_FR_D: - case NPY_FR_B: case NPY_FR_W: len += 3; /* "-##" */ + break; case NPY_FR_M: len += 3; /* "-##" */ + break; case NPY_FR_Y: len += 21; /* 64-bit year */ break; + default: + len += 3; /* handle the now defunct NPY_FR_B */ + break; } if (base >= NPY_FR_h) {