From dd2f5ced0b9b42c3e68cb6a2fbd28aad0fa61ecb Mon Sep 17 00:00:00 2001
From: Dimitri Papadopoulos
 <3234522+DimitriPapadopoulos@users.noreply.github.com>
Date: Thu, 26 Sep 2024 09:40:37 +0200
Subject: [PATCH 1/2] Apply ruff/flake8-simplify rule SIM103

SIM103 Return the condition directly
---
 src/zarr/core/indexing.py | 4 +---
 src/zarr/store/zip.py     | 5 +----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/zarr/core/indexing.py b/src/zarr/core/indexing.py
index 3968a057f8..832ce3f2e3 100644
--- a/src/zarr/core/indexing.py
+++ b/src/zarr/core/indexing.py
@@ -138,9 +138,7 @@ def is_scalar(value: Any, dtype: np.dtype[Any]) -> bool:
         return True
     if hasattr(value, "shape") and value.shape == ():
         return True
-    if isinstance(value, tuple) and dtype.names and len(value) == len(dtype.names):
-        return True
-    return False
+    return isinstance(value, tuple) and dtype.names is not None and len(value) == len(dtype.names)
 
 
 def is_pure_fancy_indexing(selection: Any, ndim: int) -> bool:
diff --git a/src/zarr/store/zip.py b/src/zarr/store/zip.py
index 2c3b16a65d..4b35307e9a 100644
--- a/src/zarr/store/zip.py
+++ b/src/zarr/store/zip.py
@@ -110,10 +110,7 @@ async def clear(self) -> None:
 
     async def empty(self) -> bool:
         with self._lock:
-            if self._zf.namelist():
-                return False
-            else:
-                return True
+            return not self._zf.namelist()
 
     def __str__(self) -> str:
         return f"zip://{self.path}"

From 6b04cb034012b6e3eafa045424104bf1cbcee95e Mon Sep 17 00:00:00 2001
From: Dimitri Papadopoulos
 <3234522+DimitriPapadopoulos@users.noreply.github.com>
Date: Thu, 26 Sep 2024 09:41:41 +0200
Subject: [PATCH 2/2] Apply ruff/flake8-simplify rule SIM118

SIM118 Use `key in dict` instead of `key in dict.keys()`
---
 src/zarr/testing/store.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/zarr/testing/store.py b/src/zarr/testing/store.py
index 70d2e16efd..aaa9a45efb 100644
--- a/src/zarr/testing/store.py
+++ b/src/zarr/testing/store.py
@@ -226,7 +226,7 @@ async def test_list_prefix(self, store: S) -> None:
         for prefix in prefixes:
             observed = tuple(sorted(await _collect_aiterator(store.list_prefix(prefix))))
             expected: tuple[str, ...] = ()
-            for key in store_dict.keys():
+            for key in store_dict:
                 if key.startswith(prefix):
                     expected += (key.removeprefix(prefix),)
             expected = tuple(sorted(expected))
@@ -245,7 +245,7 @@ async def test_list_dir(self, store: S) -> None:
         await store._set_many(store_dict.items())
 
         keys_observed = await _collect_aiterator(store.list_dir(root))
-        keys_expected = {k.removeprefix(root + "/").split("/")[0] for k in store_dict.keys()}
+        keys_expected = {k.removeprefix(root + "/").split("/")[0] for k in store_dict}
 
         assert sorted(keys_observed) == sorted(keys_expected)