initial refactor for NamedArray

xarray/backends/common.py

@@ -14,7 +14,8 @@
 from xarray.core import indexing
 from xarray.core.parallelcompat import get_chunked_array_type
 from xarray.core.pycompat import is_chunked_array
-from xarray.core.utils import FrozenDict, NdimSizeLenMixin, is_remote_uri
+from xarray.core.utils import FrozenDict, is_remote_uri
+from xarray.named_array.utils import NdimSizeLenMixin
 
 if TYPE_CHECKING:
     from io import BufferedIOBase

xarray/core/alignment.py

@@ -839,7 +839,7 @@ def is_alignable(obj):
         elif raise_on_invalid:
             raise ValueError(
                 "object to align is neither an xarray.Dataset, "
-                "an xarray.DataArray nor a dictionary: {!r}".format(variables)
+                f"an xarray.DataArray nor a dictionary: {variables!r}"
             )
         else:
             out.append(variables)

xarray/core/dataarray.py

@@ -42,10 +42,8 @@
 from xarray.core.merge import PANDAS_TYPES, MergeError
 from xarray.core.options import OPTIONS, _get_keep_attrs
 from xarray.core.utils import (
-    Default,
     HybridMappingProxy,
     ReprObject,
-    _default,
     either_dict_or_kwargs,
     emit_user_level_warning,
 )
@@ -55,6 +53,7 @@
     as_compatible_data,
     as_variable,
 )
+from xarray.named_array.utils import Default, _default
 from xarray.plot.accessor import DataArrayPlotAccessor
 from xarray.plot.utils import _get_units_from_attrs
 

xarray/core/dataset.py

@@ -91,11 +91,9 @@
 )
 from xarray.core.types import QuantileMethods, T_Dataset
 from xarray.core.utils import (
-    Default,
     Frozen,
     HybridMappingProxy,
     OrderedSet,
-    _default,
     decode_numpy_dict_values,
     drop_dims_from_indexers,
     either_dict_or_kwargs,
@@ -111,6 +109,7 @@
     broadcast_variables,
     calculate_dimensions,
 )
+from xarray.named_array.utils import Default, _default
 from xarray.plot.accessor import DatasetPlotAccessor
 
 if TYPE_CHECKING:

xarray/core/indexing.py

@@ -26,12 +26,12 @@
 )
 from xarray.core.types import T_Xarray
 from xarray.core.utils import (
-    NDArrayMixin,
     either_dict_or_kwargs,
     get_valid_numpy_dtype,
     is_scalar,
     to_0d_array,
 )
+from xarray.named_array.utils import NDArrayMixin
 
 if TYPE_CHECKING:
     from numpy.typing import DTypeLike

xarray/core/utils.py

@@ -41,7 +41,6 @@
 import inspect
 import io
 import itertools
-import math
 import os
 import re
 import sys
@@ -57,7 +56,6 @@
     MutableSet,
     Sequence,
 )
-from enum import Enum
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -542,69 +540,6 @@ def __repr__(self) -> str:
         return f"{type(self).__name__}({list(self)!r})"
 
 
-class NdimSizeLenMixin:
-    """Mixin class that extends a class that defines a ``shape`` property to
-    one that also defines ``ndim``, ``size`` and ``__len__``.
-    """
-
-    __slots__ = ()
-
-    @property
-    def ndim(self: Any) -> int:
-        """
-        Number of array dimensions.
-
-        See Also
-        --------
-        numpy.ndarray.ndim
-        """
-        return len(self.shape)
-
-    @property
-    def size(self: Any) -> int:
-        """
-        Number of elements in the array.
-
-        Equal to ``np.prod(a.shape)``, i.e., the product of the array’s dimensions.
-
-        See Also
-        --------
-        numpy.ndarray.size
-        """
-        return math.prod(self.shape)
-
-    def __len__(self: Any) -> int:
-        try:
-            return self.shape[0]
-        except IndexError:
-            raise TypeError("len() of unsized object")
-
-
-class NDArrayMixin(NdimSizeLenMixin):
-    """Mixin class for making wrappers of N-dimensional arrays that conform to
-    the ndarray interface required for the data argument to Variable objects.
-
-    A subclass should set the `array` property and override one or more of
-    `dtype`, `shape` and `__getitem__`.
-    """
-
-    __slots__ = ()
-
-    @property
-    def dtype(self: Any) -> np.dtype:
-        return self.array.dtype
-
-    @property
-    def shape(self: Any) -> tuple[int, ...]:
-        return self.array.shape
-
-    def __getitem__(self: Any, key):
-        return self.array[key]
-
-    def __repr__(self: Any) -> str:
-        return f"{type(self).__name__}(array={self.array!r})"
-
-
 class ReprObject:
     """Object that prints as the given value, for use with sentinel values."""
 
@@ -1108,14 +1043,6 @@ def __get__(self, obj: None | object, cls) -> type[_Accessor] | _Accessor:
         return self._accessor(obj)  # type: ignore  # assume it is a valid accessor!
 
 
-# Singleton type, as per https://github.com/python/typing/pull/240
-class Default(Enum):
-    token = 0
-
-
-_default = Default.token
-
-
 def iterate_nested(nested_list):
     for item in nested_list:
         if isinstance(item, list):