Skip to content

remove option to return None when the input is None from _ensure_store #1068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joshmoore merged 2 commits into from
Jul 11, 2022
Merged

remove option to return None when the input is None from _ensure_store #1068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7aec0a8
remove option to return None when the input is None from _ensure_store
grlee77 Jul 6, 2022
af6f391
Add None test
joshmoore Jul 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions zarr/_storage/store.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,7 @@ def _ensure_store(store: Any):
"""
from zarr.storage import KVStore # avoid circular import

if store is None:
return None
elif isinstance(store, BaseStore):
if isinstance(store, BaseStore):
if not store._store_version == 2:
raise ValueError(
f"cannot initialize a v2 store with a v{store._store_version} store"
Expand Down
4 changes: 3 additions & 1 deletion zarr/tests/test_storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ class InvalidStore:
with pytest.raises(ValueError):
Store._ensure_store(KVStoreV3(dict()))

assert Store._ensure_store(None) is None
Comment thread
joshmoore marked this conversation as resolved.
# cannot initialize without a store
with pytest.raises(ValueError):
Store._ensure_store(None)


def test_capabilities():
Expand Down