Skip to content

Commit 09736e5

Browse files
stefanvwesm
authored andcommitted
BUG: work around missing NPY_FR_B in numpy 1.7
1 parent 4788dea commit 09736e5

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

pandas/src/np_datetime_strings.c

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -926,31 +926,44 @@ get_datetime_iso_8601_strlen(int local, NPY_DATETIMEUNIT base)
926926
/* return 4;*/
927927
case NPY_FR_as:
928928
len += 3; /* "###" */
929+
break;
929930
case NPY_FR_fs:
930931
len += 3; /* "###" */
932+
break;
931933
case NPY_FR_ps:
932934
len += 3; /* "###" */
935+
break;
933936
case NPY_FR_ns:
934937
len += 3; /* "###" */
938+
break;
935939
case NPY_FR_us:
936940
len += 3; /* "###" */
941+
break;
937942
case NPY_FR_ms:
938943
len += 4; /* ".###" */
944+
break;
939945
case NPY_FR_s:
940946
len += 3; /* ":##" */
947+
break;
941948
case NPY_FR_m:
942949
len += 3; /* ":##" */
950+
break;
943951
case NPY_FR_h:
944952
len += 3; /* "T##" */
953+
break;
945954
case NPY_FR_D:
946-
case NPY_FR_B:
947955
case NPY_FR_W:
948956
len += 3; /* "-##" */
957+
break;
949958
case NPY_FR_M:
950959
len += 3; /* "-##" */
960+
break;
951961
case NPY_FR_Y:
952962
len += 21; /* 64-bit year */
953963
break;
964+
default:
965+
len += 3; /* handle the now defunct NPY_FR_B */
966+
break;
954967
}
955968

956969
if (base >= NPY_FR_h) {

0 commit comments

Comments
 (0)