BUG: fix crash in test_datetime_as_string

87 · mwiebe · commit 7f2f4144fdd1 · 2011-08-25T23:11:51.000-07:00
diff --git a/numpy/core/src/multiarray/datetime_strings.c b/numpy/core/src/multiarray/datetime_strings.c
@@ -1373,7 +1373,7 @@ array_datetime_as_string(PyObject *NPY_UNUSED(self), PyObject *args,
         }
         Py_DECREF(strobj);
 
-        if (!can_cast_datetime64_units(meta->base, unit, casting)) {
+        if (unit != -1 && !can_cast_datetime64_units(meta->base, unit, casting)) {
             PyErr_Format(PyExc_TypeError, "Cannot create a datetime "
                         "string as units '%s' from a NumPy datetime "
                         "with units '%s' according to the rule %s",

Original file line number	Diff line number	Diff line change
`@@ -1373,7 +1373,7 @@ array_datetime_as_string(PyObject NPY_UNUSED(self), PyObject args,`
`1373`	`1373`	`}`
`1374`	`1374`	`Py_DECREF(strobj);`
`1375`	`1375`
`1376`		`- if (!can_cast_datetime64_units(meta->base, unit, casting)) {`
	`1376`	`+ if (unit != -1 && !can_cast_datetime64_units(meta->base, unit, casting)) {`
`1377`	`1377`	`PyErr_Format(PyExc_TypeError, "Cannot create a datetime "`
`1378`	`1378`	`"string as units '%s' from a NumPy datetime "`
`1379`	`1379`	`"with units '%s' according to the rule %s",`