BUG: Fixups for last changes to make CI pass

seberg · seberg · commit 9a64758ab0fc · 2022-10-24T17:31:31.000+02:00
I had tested the refguide mainly (the functions part only), which missed
a lot of smaller errors in the last iteration...
diff --git a/numpy/core/arrayprint.py b/numpy/core/arrayprint.py
@@ -408,7 +408,7 @@ def str_format(x):
     return str(x)
 
 def _get_formatdict(data, *, precision, floatmode, suppress, sign, legacy,
-                    formatter, fmt=None, **kwargs):
+                    formatter, fmt=None, dtype=None, **kwargs):
     # note: extra arguments in kwargs are ignored
 
     # wrapped in lambdas to avoid taking a code path with the wrong type of data
@@ -426,7 +426,7 @@ def _get_formatdict(data, *, precision, floatmode, suppress, sign, legacy,
         'longcomplexfloat': lambda: ComplexFloatingFormat(
             data, precision, floatmode, suppress, sign,
             legacy=legacy, fmt=fmt, longdouble_quoting=True),
-        'datetime': lambda: DatetimeFormat(data, legacy=legacy),
+        'datetime': lambda: DatetimeFormat(data, legacy=legacy, dtype=dtype),
         'timedelta': lambda: TimedeltaFormat(data),
         'object': lambda: _object_format,
         'void': lambda: str_format,
@@ -499,17 +499,14 @@ def get_formatter(*, dtype=None, data=None, fmt=None, options=None):
         fmt = None
 
     if fmt is not None:
-        if options is not None:
-            raise TypeError("Use of options is only supported if `fmt=None`")
-
         options = _default_format_options
 
         if fmt is not repr and fmt is not str:
             raise TypeError(
                     "get_formatter(): only `repr`, `str`, and None (or '') "
                     "is currently supported for `fmt`.")
 
-    formatdict = _get_formatdict(data, fmt=fmt, **options)
+    formatdict = _get_formatdict(data, dtype=dtype, fmt=fmt, **options)
 
     dtypeobj = dtype.type
 
@@ -548,7 +545,8 @@ def get_formatter(*, dtype=None, data=None, fmt=None, options=None):
             # given and `arr.dtype` cannot be a subarray dtype:
             assert data is None
             return SubArrayFormat(
-                get_formatter(dtype=dtype.base, fmt=fmt, options=options))
+                get_formatter(dtype=dtype.base, fmt=fmt,
+                              options=None if fmt is not None else options))
         else:
             return formatdict['void']()
     else:
@@ -1380,16 +1378,20 @@ def __call__(self, x):
 
 class _TimelikeFormat:
     def __init__(self, data):
-        non_nat = data[~isnat(data)]
-        if len(non_nat) > 0:
-            # Max str length of non-NaT elements
-            max_str_len = max(len(self._format_non_nat(np.max(non_nat))),
-                              len(self._format_non_nat(np.min(non_nat))))
+        if data is not None:
+            non_nat = data[~isnat(data)]
+            if len(non_nat) > 0:
+                # Max str length of non-NaT elements
+                max_str_len = max(len(self._format_non_nat(np.max(non_nat))),
+                                  len(self._format_non_nat(np.min(non_nat))))
+            else:
+                max_str_len = 0
+            if len(non_nat) < data.size:
+                # data contains a NaT
+                max_str_len = max(max_str_len, 5)
         else:
             max_str_len = 0
-        if len(non_nat) < data.size:
-            # data contains a NaT
-            max_str_len = max(max_str_len, 5)
+
         self._format = '%{}s'.format(max_str_len)
         self._nat = "'NaT'".rjust(max_str_len)
 
@@ -1406,11 +1408,13 @@ def __call__(self, x):
 
 class DatetimeFormat(_TimelikeFormat):
     def __init__(self, x, unit=None, timezone=None, casting='same_kind',
-                 legacy=False):
+                 legacy=False, *, dtype=None):
         # Get the unit from the dtype
         if unit is None:
-            if x.dtype.kind == 'M':
-                unit = datetime_data(x.dtype)[0]
+            if dtype is None:
+                dtype = x.dtype
+            if dtype.kind == 'M':
+                unit = datetime_data(dtype)[0]
             else:
                 unit = 's'
 
diff --git a/numpy/core/tests/test_arrayprint.py b/numpy/core/tests/test_arrayprint.py
@@ -669,7 +669,7 @@ def test_sign_spacing_structured(self):
         assert_equal(repr(a),
             "array([(1., 1.), (1., 1.)], dtype=[('f0', '<f4'), ('f1', '<f4')])")
         assert_equal(repr(a[0]),
-            "np.void((1., 1.), dtype=[('f0', '<f4'), ('f1', '<f4')])")
+            "np.void((1.0, 1.0), dtype=[('f0', '<f4'), ('f1', '<f4')])")
 
     def test_floatmode(self):
         x = np.array([0.6104, 0.922, 0.457, 0.0906, 0.3733, 0.007244,
diff --git a/numpy/core/tests/test_records.py b/numpy/core/tests/test_records.py
@@ -132,7 +132,7 @@ def test_0d_recarray_repr(self):
 
         record = arr_0d[()]
         assert_equal(repr(record), 
-            "np.record((1, 2., '2003'), "
+            "np.record((1, 2.0, '2003'), "
             "dtype=[('f0', '<i4'), ('f1', '<f8'), ('f2', '<M8[Y]')])")
         # 1.13 converted to python scalars before the repr
         try:
