77import numpy as np
88
99
10- from zarr .compat import PY2 , binary_type
10+ from zarr .compat import PY2 , binary_type , Mapping
1111from zarr .errors import MetadataError
1212
1313
1414ZARR_FORMAT = 2
1515
1616
17- def _ensure_str (s ):
17+ def ensure_str (s ):
1818 if PY2 : # pragma: py3 no cover
1919 # noinspection PyUnresolvedReferences
2020 if isinstance (s , buffer ): # noqa
@@ -27,12 +27,32 @@ def _ensure_str(s):
2727 return s
2828
2929
30+ def json_dumps (o ):
31+ """Write JSON in a consistent, human-readable way."""
32+ return json .dumps (o , indent = 4 , sort_keys = True , ensure_ascii = True ,
33+ separators = (',' , ': ' ))
34+
35+
36+ def parse_metadata (s ):
37+ if isinstance (s , Mapping ):
38+ # assume metadata has already been parsed into a mapping object
39+ meta = s
40+ else :
41+ # assume metadata needs to be parsed as JSON
42+ s = ensure_str (s )
43+ meta = json .loads (s )
44+ return meta
45+
46+
3047def decode_array_metadata (s ):
31- s = _ensure_str (s )
32- meta = json .loads (s )
48+ meta = parse_metadata (s )
49+
50+ # check metadata format
3351 zarr_format = meta .get ('zarr_format' , None )
3452 if zarr_format != ZARR_FORMAT :
3553 raise MetadataError ('unsupported zarr format: %s' % zarr_format )
54+
55+ # extract array metadata fields
3656 try :
3757 dtype = decode_dtype (meta ['dtype' ])
3858 fill_value = decode_fill_value (meta ['fill_value' ], dtype )
@@ -67,8 +87,7 @@ def encode_array_metadata(meta):
6787 order = meta ['order' ],
6888 filters = meta ['filters' ],
6989 )
70- s = json .dumps (meta , indent = 4 , sort_keys = True , ensure_ascii = True ,
71- separators = (',' , ': ' ))
90+ s = json_dumps (meta )
7291 b = s .encode ('ascii' )
7392 return b
7493
@@ -98,14 +117,14 @@ def decode_dtype(d):
98117
99118
100119def decode_group_metadata (s ):
101- s = _ensure_str (s )
102- meta = json .loads (s )
120+ meta = parse_metadata (s )
121+
122+ # check metadata format version
103123 zarr_format = meta .get ('zarr_format' , None )
104124 if zarr_format != ZARR_FORMAT :
105125 raise MetadataError ('unsupported zarr format: %s' % zarr_format )
106- meta = dict (
107- zarr_format = ZARR_FORMAT ,
108- )
126+
127+ meta = dict (zarr_format = zarr_format )
109128 return meta
110129
111130
@@ -115,7 +134,7 @@ def encode_group_metadata(meta=None):
115134 meta = dict (
116135 zarr_format = ZARR_FORMAT ,
117136 )
118- s = json . dumps (meta , indent = 4 , sort_keys = True , ensure_ascii = True )
137+ s = json_dumps (meta )
119138 b = s .encode ('ascii' )
120139 return b
121140
0 commit comments