Skip to content

Commit 6732589

Browse files
committed
use _parse methods
1 parent 5c63de3 commit 6732589

File tree

2 files changed

+5
-28
lines changed

2 files changed

+5
-28
lines changed

src/zarr/core/array.py

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@
110110
_parse_array_array_codec,
111111
_parse_array_bytes_codec,
112112
_parse_bytes_bytes_codec,
113-
_resolve_codec,
114113
get_pipeline_class,
115114
)
116115
from zarr.storage import StoreLike, make_store_path
@@ -4002,30 +4001,11 @@ def _get_default_chunk_encoding_v3(
40024001
default_serializer = zarr_config.get("array.v3_default_serializer").get(dtype_key)
40034002
default_compressors = zarr_config.get("array.v3_default_compressors").get(dtype_key)
40044003

4005-
filters_list: list[ArrayArrayCodec] = []
4006-
compressors_list: list[BytesBytesCodec] = []
4004+
filters = tuple(_parse_array_array_codec(codec_dict) for codec_dict in default_filters)
4005+
serializer = _parse_array_bytes_codec(default_serializer)
4006+
compressors = tuple(_parse_bytes_bytes_codec(codec_dict) for codec_dict in default_compressors)
40074007

4008-
serializer = _resolve_codec(default_serializer)
4009-
if serializer is None:
4010-
raise ValueError("Required ArrayBytesCodec was not found.")
4011-
if not isinstance(serializer, ArrayBytesCodec):
4012-
raise TypeError(f"Expected ArrayBytesCodec, got: {type(serializer)}")
4013-
4014-
for codec_dict in default_filters:
4015-
codec = _resolve_codec(codec_dict)
4016-
if isinstance(codec, ArrayArrayCodec):
4017-
filters_list.append(codec)
4018-
else:
4019-
raise TypeError(f"Expected ArrayArrayCodec, got: {type(codec)}")
4020-
4021-
for codec_dict in default_compressors:
4022-
codec = _resolve_codec(codec_dict)
4023-
if isinstance(codec, BytesBytesCodec):
4024-
compressors_list.append(codec)
4025-
else:
4026-
raise TypeError(f"Expected BytesBytesCodec, got: {type(codec)}")
4027-
4028-
return tuple(filters_list), serializer, tuple(compressors_list)
4008+
return filters, serializer, compressors
40294009

40304010

40314011
def _get_default_chunk_encoding_v2(

tests/test_config.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -303,10 +303,7 @@ class NewCodec2(BytesCodec):
303303
get_codec_class("new_codec")
304304

305305

306-
@pytest.mark.parametrize(
307-
("dtype", "expected_codecs"),
308-
["int", "bytes", "str"],
309-
)
306+
@pytest.mark.parametrize("dtype", ["int", "bytes", "str"])
310307
async def test_default_codecs(dtype: str) -> None:
311308
with config.set(
312309
{

0 commit comments

Comments
 (0)