Apply Sourcery suggestions and fix typos

Author: DimitriPapadopoulos

src/zarr/abc/metadata.py

@@ -28,8 +28,6 @@ def to_dict(self) -> dict[str, JSON]:
             value = getattr(self, key)
             if isinstance(value, Metadata):
                 out_dict[field.name] = getattr(self, field.name).to_dict()
-            elif isinstance(value, str):
-                out_dict[key] = value
             elif isinstance(value, Sequence):
                 out_dict[key] = tuple(v.to_dict() if isinstance(v, Metadata) else v for v in value)
             else:

src/zarr/codecs/sharding.py

@@ -113,7 +113,7 @@ class _ShardIndex(NamedTuple):
 
     @property
     def chunks_per_shard(self) -> ChunkCoords:
-        result = tuple(self.offsets_and_lengths.shape[0:-1])
+        result = tuple(self.offsets_and_lengths.shape[:-1])
         # The cast is required until https://github.com/numpy/numpy/pull/27211 is merged
         return cast("ChunkCoords", result)
 
@@ -409,8 +409,8 @@ def validate(self, *, shape: ChunkCoords, dtype: np.dtype[Any], chunk_grid: Chun
             )
         if not isinstance(chunk_grid, RegularChunkGrid):
             raise TypeError("Sharding is only compatible with regular chunk grids.")
-        if not all(
-            s % c == 0
+        if any(
+            s % c != 0
             for s, c in zip(
                 chunk_grid.chunk_shape,
                 self.chunk_shape,

src/zarr/core/array.py

@@ -650,7 +650,7 @@ async def _create(
                 overwrite=overwrite,
             )
         else:
-            raise ValueError(f"Insupported zarr_format. Got: {zarr_format}")
+            raise ValueError(f"Unsupported zarr_format. Got: {zarr_format}")
 
         if data is not None:
             # insert user-provided data

src/zarr/core/buffer/core.py

@@ -115,7 +115,7 @@ def check_item_key_is_1d_contiguous(key: Any) -> None:
         raise TypeError(
             f"Item key has incorrect type (expected slice, got {key.__class__.__name__})"
         )
-    if not (key.step is None or key.step == 1):
+    if key.step is not None and key.step != 1:
         raise ValueError("slice must be contiguous")
 
 

src/zarr/core/common.py

@@ -145,7 +145,7 @@ def parse_shapelike(data: int | Iterable[int]) -> tuple[int, ...]:
     if not all(isinstance(v, int) for v in data_tuple):
         msg = f"Expected an iterable of integers. Got {data} instead."
         raise TypeError(msg)
-    if not all(v > -1 for v in data_tuple):
+    if any(v < 0 for v in data_tuple):
         msg = f"Expected all values to be non-negative. Got {data} instead."
         raise ValueError(msg)
     return data_tuple

src/zarr/core/indexing.py

@@ -436,7 +436,7 @@ def replace_ellipsis(selection: Any, shape: ChunkCoords) -> SelectionNormalized:
     selection = ensure_tuple(selection)
 
     # count number of ellipsis present
-    n_ellipsis = sum(1 for i in selection if i is Ellipsis)
+    n_ellipsis = selection.count(Ellipsis)
 
     if n_ellipsis > 1:
         # more than 1 is an error

src/zarr/core/metadata/v2.py

@@ -249,11 +249,11 @@ def parse_filters(data: object) -> tuple[numcodecs.abc.Codec, ...] | None:
     """
     Parse a potential tuple of filters
     """
-    out: list[numcodecs.abc.Codec] = []
 
     if data is None:
         return data
     if isinstance(data, Iterable):
+        out: list[numcodecs.abc.Codec] = []
         for idx, val in enumerate(data):
             if isinstance(val, numcodecs.abc.Codec):
                 out.append(val)

src/zarr/core/metadata/v3.py

@@ -107,11 +107,11 @@ def validate_codecs(codecs: tuple[Codec, ...], dtype: DataType) -> None:
     # we need to have special codecs if we are decoding vlen strings or bytestrings
     # TODO: use codec ID instead of class name
     codec_class_name = abc.__class__.__name__
-    if dtype == DataType.string and not codec_class_name == "VLenUTF8Codec":
+    if dtype == DataType.string and codec_class_name != "VLenUTF8Codec":
         raise ValueError(
             f"For string dtype, ArrayBytesCodec must be `VLenUTF8Codec`, got `{codec_class_name}`."
         )
-    if dtype == DataType.bytes and not codec_class_name == "VLenBytesCodec":
+    if dtype == DataType.bytes and codec_class_name != "VLenBytesCodec":
         raise ValueError(
             f"For bytes dtype, ArrayBytesCodec must be `VLenBytesCodec`, got `{codec_class_name}`."
         )
@@ -574,9 +574,8 @@ def parse_fill_value(
             and np.isclose(np.imag(fill_value), np.imag(casted_value), equal_nan=True)
         ):
             raise ValueError(f"fill value {fill_value!r} is not valid for dtype {data_type}")
-    else:
-        if fill_value != casted_value:
-            raise ValueError(f"fill value {fill_value!r} is not valid for dtype {data_type}")
+    elif fill_value != casted_value:
+        raise ValueError(f"fill value {fill_value!r} is not valid for dtype {data_type}")
 
     return casted_value
 

src/zarr/registry.py

@@ -179,9 +179,9 @@ def _parse_bytes_bytes_codec(data: dict[str, JSON] | Codec) -> BytesBytesCodec:
         if not isinstance(result, BytesBytesCodec):
             msg = f"Expected a dict representation of a BytesBytesCodec; got a dict representation of a {type(result)} instead."
             raise TypeError(msg)
+    elif not isinstance(data, BytesBytesCodec):
+        raise TypeError(f"Expected a BytesBytesCodec. Got {type(data)} instead.")
     else:
-        if not isinstance(data, BytesBytesCodec):
-            raise TypeError(f"Expected a BytesBytesCodec. Got {type(data)} instead.")
         result = data
     return result
 
@@ -199,9 +199,9 @@ def _parse_array_bytes_codec(data: dict[str, JSON] | Codec) -> ArrayBytesCodec:
         if not isinstance(result, ArrayBytesCodec):
             msg = f"Expected a dict representation of a ArrayBytesCodec; got a dict representation of a {type(result)} instead."
             raise TypeError(msg)
+    elif not isinstance(data, ArrayBytesCodec):
+        raise TypeError(f"Expected a ArrayBytesCodec. Got {type(data)} instead.")
     else:
-        if not isinstance(data, ArrayBytesCodec):
-            raise TypeError(f"Expected a ArrayBytesCodec. Got {type(data)} instead.")
         result = data
     return result
 
@@ -219,9 +219,9 @@ def _parse_array_array_codec(data: dict[str, JSON] | Codec) -> ArrayArrayCodec:
         if not isinstance(result, ArrayArrayCodec):
             msg = f"Expected a dict representation of a ArrayArrayCodec; got a dict representation of a {type(result)} instead."
             raise TypeError(msg)
+    elif not isinstance(data, ArrayArrayCodec):
+        raise TypeError(f"Expected a ArrayArrayCodec. Got {type(data)} instead.")
     else:
-        if not isinstance(data, ArrayArrayCodec):
-            raise TypeError(f"Expected a ArrayArrayCodec. Got {type(data)} instead.")
         result = data
     return result
 

src/zarr/storage/_fsspec.py

@@ -355,7 +355,7 @@ async def set_partial_values(
     async def list(self) -> AsyncIterator[str]:
         # docstring inherited
         allfiles = await self.fs._find(self.path, detail=False, withdirs=False)
-        for onefile in (a.removeprefix(self.path + "/") for a in allfiles):
+        for onefile in (a.removeprefix(f"{self.path}/") for a in allfiles):
             yield onefile
 
     async def list_dir(self, prefix: str) -> AsyncIterator[str]:
@@ -365,7 +365,7 @@ async def list_dir(self, prefix: str) -> AsyncIterator[str]:
             allfiles = await self.fs._ls(prefix, detail=False)
         except FileNotFoundError:
             return
-        for onefile in (a.replace(prefix + "/", "") for a in allfiles):
+        for onefile in (a.replace(f"{prefix}/", "") for a in allfiles):
             yield onefile.removeprefix(self.path).removeprefix("/")
 
     async def list_prefix(self, prefix: str) -> AsyncIterator[str]: