sync metadata methods with current master branch

zarr-developers · Oct 21, 2021 · 15d4d78 · 15d4d78
1 parent ca4db80
commit 15d4d78
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/zarr/meta.py b/zarr/meta.py
@@ -16,6 +16,7 @@ class Metadata2:
 
     @classmethod
     def parse_metadata(cls, s: Union[MappingType, str]) -> MappingType[str, Any]:
+
         # Here we allow that a store may return an already-parsed metadata object,
         # or a string of JSON that we will parse here. We allow for an already-parsed
         # object to accommodate a consolidated metadata store, where all the metadata for
@@ -24,9 +25,11 @@ def parse_metadata(cls, s: Union[MappingType, str]) -> MappingType[str, Any]:
         if isinstance(s, Mapping):
             # assume metadata has already been parsed into a mapping object
             meta = s
+
         else:
             # assume metadata needs to be parsed as JSON
             meta = json_loads(s)
+
         return meta
 
     @classmethod
@@ -40,13 +43,14 @@ def decode_array_metadata(cls, s: Union[MappingType, str]) -> MappingType[str, A
 
         # extract array metadata fields
         try:
-            # dimension_separator = meta.get("dimension_separator", None)
             dtype = cls.decode_dtype(meta["dtype"])
             if dtype.hasobject:
                 import numcodecs
                 object_codec = numcodecs.get_codec(meta['filters'][0])
             else:
                 object_codec = None
+
+            dimension_separator = meta.get("dimension_separator", None)
             fill_value = cls.decode_fill_value(meta['fill_value'], dtype, object_codec)
             meta = dict(
                 zarr_format=meta["zarr_format"],
@@ -57,8 +61,9 @@ def decode_array_metadata(cls, s: Union[MappingType, str]) -> MappingType[str, A
                 fill_value=fill_value,
                 order=meta["order"],
                 filters=meta["filters"],
-                dimension_separator=meta.get("dimension_separator", "."),
             )
+            if dimension_separator:
+                meta['dimension_separator'] = dimension_separator
         except Exception as e:
             raise MetadataError("error decoding metadata") from e
         else: