Merge pull request #312 from DimitriPapadopoulos/isinstance_startswith

Simpler startswith() and isinstance() calls
ome · Sep 29, 2023 · 652cd8b · 652cd8b
2 parents d8e86f1 + 395a340
commit 652cd8b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ome_zarr/format.py b/ome_zarr/format.py
@@ -187,7 +187,7 @@ def init_store(self, path: str, mode: str = "r") -> FSStore:
         }
 
         mkdir = True
-        if "r" in mode or path.startswith("http") or path.startswith("s3"):
+        if "r" in mode or path.startswith(("http", "s3")):
             # Could be simplified on the fsspec side
             mkdir = False
         if mkdir:

diff --git a/ome_zarr/reader.py b/ome_zarr/reader.py
@@ -31,7 +31,7 @@ def __init__(
         self.zarr = zarr
         self.root = root
         self.seen: List[ZarrLocation] = []
-        if isinstance(root, Node) or isinstance(root, Reader):
+        if isinstance(root, (Node, Reader)):
             self.seen = root.seen
         else:
             self.seen = cast(List[ZarrLocation], root)
@@ -235,7 +235,7 @@ def __init__(self, node: Node) -> None:
                     if rgba:
                         rgba = [x / 255 for x in rgba]
 
-                    if isinstance(label_value, bool) or isinstance(label_value, int):
+                    if isinstance(label_value, (bool, int)):
                         colors[label_value] = rgba
                     else:
                         raise Exception("not bool or int")