Simplify the compatibility layer

Author: gtca

src/mudata/_core/compat.py

@@ -1,51 +1,47 @@
-from collections.abc import Mapping
+from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
+    from collections.abc import Mapping
+
     from anndata import AnnData
+    from anndata._core.raw import Raw
 
 try:
     from anndata._core.aligned_mapping import AlignedView, AxisArrays, PairwiseArrays
 except ImportError:
     # anndata < 0.10.9
     from anndata._core.aligned_mapping import (
-        AlignedActualMixin,
+        AlignedViewMixin as AlignedView,
+    )
+    from anndata._core.aligned_mapping import (
+        AxisArrays as AxisArraysLegacy,
+    )
+    from anndata._core.aligned_mapping import (
         AxisArraysBase,
-        PairwiseArraysBase,
     )
     from anndata._core.aligned_mapping import (
-        AlignedViewMixin as AlignedView,
+        PairwiseArrays as PairwiseArraysLegacy,
     )
 
-    class AxisArrays(AlignedActualMixin, AxisArraysBase):
+    class AxisArrays(AxisArraysLegacy):
         def __init__(
             self,
-            parent: "AnnData",
+            parent: AnnData | Raw,
             axis: int,
             store: Mapping | AxisArraysBase | None = None,
         ):
-            self._parent = parent
-            if axis not in {0, 1}:
-                raise ValueError()
-            self._axis = axis
-            self._data = dict()
-            if store is not None:
-                self.update(store)
-
-    class PairwiseArrays(AlignedActualMixin, PairwiseArraysBase):
+            super().__init__(parent, axis=axis, vals=store)
+
+    class PairwiseArrays(PairwiseArraysLegacy):
         def __init__(
             self,
-            parent: "AnnData",
+            parent: AnnData,
             axis: int,
             store: Mapping | None = None,
         ):
-            self._parent = parent
-            if axis not in {0, 1}:
-                raise ValueError()
-            self._axis = axis
-            self._data = dict()
-            if store is not None:
-                self.update(store)
+            super().__init__(parent, axis=axis, vals=store)
 
 
 __all__ = ["AlignedView", "AxisArrays", "PairwiseArrays"]