Merge pull request #17645 from lormuc/timedelta-nat-format

charris · web-flow · commit 4e61c8958bea · 2020-11-14T05:03:48.000-07:00
BUG: fix np.timedelta64('nat').__format__ throwing an exception
diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src
@@ -274,7 +274,8 @@ gentype_format(PyObject *self, PyObject *args)
     if (Py_TYPE(self) == &PyBoolArrType_Type) {
         obj = PyBool_FromLong(PyArrayScalar_VAL(self, Bool));
     }
-    else if (PyArray_IsScalar(self, Integer)) {
+    else if (PyArray_IsScalar(self, Integer)
+             && !PyArray_IsScalar(self, Timedelta)) {
         obj = Py_TYPE(self)->tp_as_number->nb_int(self);
     }
     else if (PyArray_IsScalar(self, Floating)) {
diff --git a/numpy/core/tests/test_datetime.py b/numpy/core/tests/test_datetime.py
@@ -430,6 +430,10 @@ def test_timedelta_0_dim_object_array_conversion(self):
                             np.timedelta64)
         assert_equal(actual, expected)
 
+    def test_timedelta_nat_format(self):
+        # gh-17552
+        assert_equal('NaT', '{0}'.format(np.timedelta64('nat')))
+
     def test_timedelta_scalar_construction_units(self):
         # String construction detecting units
         assert_equal(np.datetime64('2010').dtype,

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,8 @@ gentype_format(PyObject self, PyObject args)`
`274`	`274`	`if (Py_TYPE(self) == &PyBoolArrType_Type) {`
`275`	`275`	`obj = PyBool_FromLong(PyArrayScalar_VAL(self, Bool));`
`276`	`276`	`}`
`277`		`- else if (PyArray_IsScalar(self, Integer)) {`
	`277`	`+ else if (PyArray_IsScalar(self, Integer)`
	`278`	`+ && !PyArray_IsScalar(self, Timedelta)) {`
`278`	`279`	`obj = Py_TYPE(self)->tp_as_number->nb_int(self);`
`279`	`280`	`}`
`280`	`281`	`else if (PyArray_IsScalar(self, Floating)) {`