Format

Author: Saransh-cpp

zarr/_storage/store.py

@@ -222,8 +222,7 @@ def _validate_key(self, key: str):
             )
 
         if (
-            not key.startswith(("data/", "meta/"))
-            and key != "zarr.json"
+            not key.startswith(("data/", "meta/")) and key != "zarr.json"
             # TODO: Possibly allow key == ".zmetadata" too if we write a
             #       consolidated metadata spec corresponding to this?
         ):

zarr/hierarchy.py

@@ -591,27 +591,33 @@ def groups(self):
             for key in sorted(listdir(self._store, self._path)):
                 path = self._key_prefix + key
                 if contains_group(self._store, path, explicit_only=False):
-                    yield key, Group(
+                    yield (
+                        key,
+                        Group(
+                            self._store,
+                            path=path,
+                            read_only=self._read_only,
+                            chunk_store=self._chunk_store,
+                            cache_attrs=self.attrs.cache,
+                            synchronizer=self._synchronizer,
+                            zarr_version=self._version,
+                        ),
+                    )
+
+        else:
+            for key in self.group_keys():
+                path = self._key_prefix + key
+                yield (
+                    key,
+                    Group(
                         self._store,
                         path=path,
                         read_only=self._read_only,
                         chunk_store=self._chunk_store,
                         cache_attrs=self.attrs.cache,
                         synchronizer=self._synchronizer,
                         zarr_version=self._version,
-                    )
-
-        else:
-            for key in self.group_keys():
-                path = self._key_prefix + key
-                yield key, Group(
-                    self._store,
-                    path=path,
-                    read_only=self._read_only,
-                    chunk_store=self._chunk_store,
-                    cache_attrs=self.attrs.cache,
-                    synchronizer=self._synchronizer,
-                    zarr_version=self._version,
+                    ),
                 )
 
     def array_keys(self, recurse=False):

zarr/indexing.py

@@ -370,8 +370,9 @@ def __init__(self, dim_sel, dim_len, dim_chunk_len):
         # check shape
         if dim_sel.shape[0] != dim_len:
             raise IndexError(
-                "Boolean array has the wrong length for dimension; "
-                "expected {}, got {}".format(dim_len, dim_sel.shape[0])
+                "Boolean array has the wrong length for dimension; " "expected {}, got {}".format(
+                    dim_len, dim_sel.shape[0]
+                )
             )
 
         # store attributes
@@ -919,8 +920,9 @@ def check_fields(fields, dtype):
     # check type
     if not isinstance(fields, (str, list, tuple)):
         raise IndexError(
-            "'fields' argument must be a string or list of strings; found "
-            "{!r}".format(type(fields))
+            "'fields' argument must be a string or list of strings; found " "{!r}".format(
+                type(fields)
+            )
         )
     if fields:
         if dtype.names is None:

zarr/storage.py

@@ -2704,9 +2704,7 @@ def listdir(self, path=None):
                 SELECT LTRIM(SUBSTR(k, LENGTH(?) + 1), "/") || "/" AS m
                 FROM zarr WHERE k LIKE (? || "{sep}%")
             ) ORDER BY l ASC
-            """.format(
-                sep=sep
-            ),
+            """.format(sep=sep),
             (path, path),
         )
         keys = list(map(operator.itemgetter(0), keys))

zarr/tests/test_meta.py

@@ -495,9 +495,7 @@ def test_decode_array_unsupported_format():
         "compressor": {"id": "zlib", "level": 1},
         "fill_value": null,
         "order": "C"
-    }""" % (
-        ZARR_FORMAT - 1
-    )
+    }""" % (ZARR_FORMAT - 1)
     with pytest.raises(MetadataError):
         decode_array_metadata(meta_json)
 
@@ -537,9 +535,7 @@ def test_decode_group():
     # unsupported format
     b = """{
         "zarr_format": %s
-    }""" % (
-        ZARR_FORMAT - 1
-    )
+    }""" % (ZARR_FORMAT - 1)
     with pytest.raises(MetadataError):
         decode_group_metadata(b)
 

zarr/util.py

@@ -307,8 +307,9 @@ def normalize_fill_value(fill_value, dtype: np.dtype):
 
         if not isinstance(fill_value, str):
             raise ValueError(
-                "fill_value {!r} is not valid for dtype {}; must be a "
-                "unicode string".format(fill_value, dtype)
+                "fill_value {!r} is not valid for dtype {}; must be a " "unicode string".format(
+                    fill_value, dtype
+                )
             )
 
     else:
@@ -322,8 +323,9 @@ def normalize_fill_value(fill_value, dtype: np.dtype):
         except Exception as e:
             # re-raise with our own error message to be helpful
             raise ValueError(
-                "fill_value {!r} is not valid for dtype {}; nested "
-                "exception: {}".format(fill_value, dtype, e)
+                "fill_value {!r} is not valid for dtype {}; nested " "exception: {}".format(
+                    fill_value, dtype, e
+                )
             )
 
     return fill_value