Type shape methods (#6767)

Author: Illviljan

xarray/backends/pydap_.py

@@ -31,7 +31,7 @@ def __init__(self, array):
         self.array = array
 
     @property
-    def shape(self):
+    def shape(self) -> tuple[int, ...]:
         return self.array.shape
 
     @property

xarray/backends/rasterio_.py

@@ -48,7 +48,7 @@ def dtype(self):
         return self._dtype
 
     @property
-    def shape(self):
+    def shape(self) -> tuple[int, ...]:
         return self._shape
 
     def _get_indexer(self, key):

xarray/coding/strings.py

@@ -225,7 +225,7 @@ def dtype(self):
         return np.dtype("S" + str(self.array.shape[-1]))
 
     @property
-    def shape(self):
+    def shape(self) -> tuple[int, ...]:
         return self.array.shape[:-1]
 
     def __repr__(self):

xarray/core/indexing.py

@@ -510,7 +510,7 @@ def _updated_key(self, new_key):
         return OuterIndexer(full_key)
 
     @property
-    def shape(self):
+    def shape(self) -> tuple[int, ...]:
         shape = []
         for size, k in zip(self.array.shape, self.key.tuple):
             if isinstance(k, slice):
@@ -569,7 +569,7 @@ def __init__(self, array, key):
         self.array = as_indexable(array)
 
     @property
-    def shape(self):
+    def shape(self) -> tuple[int, ...]:
         return np.broadcast(*self.key.tuple).shape
 
     def __array__(self, dtype=None):
@@ -1392,7 +1392,7 @@ def __array__(self, dtype: DTypeLike = None) -> np.ndarray:
         return np.asarray(array.values, dtype=dtype)
 
     @property
-    def shape(self) -> tuple[int]:
+    def shape(self) -> tuple[int, ...]:
         return (len(self.array),)
 
     def _convert_scalar(self, item):

xarray/core/utils.py

@@ -580,7 +580,7 @@ def dtype(self: Any) -> np.dtype:
         return self.array.dtype
 
     @property
-    def shape(self: Any) -> tuple[int]:
+    def shape(self: Any) -> tuple[int, ...]:
         return self.array.shape
 
     def __getitem__(self: Any, key):

xarray/tests/test_formatting.py

@@ -458,7 +458,7 @@ def __array_function__(self, *args, **kwargs):
             return NotImplemented
 
         @property
-        def shape(self):
+        def shape(self) -> tuple[int, ...]:
             return self.value.shape
 
         @property