Change inheritance of errors so Group and Array inherit from Node

Author: ruaridhg

src/zarr/errors.py

@@ -1,7 +1,5 @@
 from typing import Any
 
-from typing_extensions import deprecated
-
 __all__ = [
     "ArrayNotFoundError",
     "BaseZarrError",
@@ -29,15 +27,22 @@ def __init__(self, *args: Any) -> None:
         super().__init__(self._msg.format(*args))
 
 
-class GroupNotFoundError(BaseZarrError, FileNotFoundError):
+class NodeNotFoundError(BaseZarrError, FileNotFoundError):
     """
-    Raised when a group isn't found at a certain path.
+    Raised when a node (array or group) is not found at a certain path.
     """
 
-    _msg = "No group found in store {!r} at path {!r}"
+    def __init__(self, *args: Any) -> None:
+        if len(args) == 1:
+            # Pre-formatted message
+            super(BaseZarrError, self).__init__(args[0])
+        else:
+            # Store and path arguments - format them
+            _msg = "No node found in store {!r} at path {!r}"
+            super(BaseZarrError, self).__init__(_msg.format(*args))
 
 
-class ArrayNotFoundError(BaseZarrError, FileNotFoundError):
+class ArrayNotFoundError(NodeNotFoundError):
     """
     Raised when an array isn't found at a certain path.
     """
@@ -52,14 +57,19 @@ def __init__(self, *args: Any) -> None:
             super(BaseZarrError, self).__init__(_msg.format(*args))
 
 
-@deprecated("Use NodeNotFoundError instead.", category=None)
-class PathNotFoundError(BaseZarrError):
-    # Backwards compatibility with v2. Superseded by NodeNotFoundError.
-    ...
-
+class GroupNotFoundError(NodeNotFoundError):
+    """
+    Raised when a group isn't found at a certain path.
+    """
 
-class NodeNotFoundError(PathNotFoundError):
-    """Raised when an array or group does not exist at a certain path."""
+    def __init__(self, *args: Any) -> None:
+        if len(args) == 1:
+            # Pre-formatted message
+            super(BaseZarrError, self).__init__(args[0])
+        else:
+            # Store and path arguments - format them
+            _msg = "No group found in store {!r} at path {!r}"
+            super(BaseZarrError, self).__init__(_msg.format(*args))
 
 
 class ContainsGroupError(BaseZarrError):

tests/test_api.py

@@ -192,7 +192,7 @@ async def test_open_array(memory_store: MemoryStore, zarr_format: ZarrFormat) ->
     assert z.read_only
 
     # path not found
-    with pytest.raises((NodeNotFoundError, GroupNotFoundError)):
+    with pytest.raises(NodeNotFoundError):
         zarr.api.synchronous.open(store="doesnotexist", mode="r", zarr_format=zarr_format)