allow using __array_function__ as a fallback for missing array API …

…funcs
pydata · Sep 22, 2024 · ecb47d6 · ecb47d6
1 parent a10e97a
commit ecb47d6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/xarray/core/indexing.py b/xarray/core/indexing.py
@@ -875,10 +875,10 @@ def as_indexable(array):
         return PandasIndexingAdapter(array)
     if is_duck_dask_array(array):
         return DaskIndexingAdapter(array)
-    if hasattr(array, "__array_function__"):
-        return NdArrayLikeIndexingAdapter(array)
     if hasattr(array, "__array_namespace__"):
         return ArrayApiIndexingAdapter(array)
+    if hasattr(array, "__array_function__"):
+        return NdArrayLikeIndexingAdapter(array)
 
     raise TypeError(f"Invalid array type: {type(array)}")
 

diff --git a/xarray/tests/test_indexing.py b/xarray/tests/test_indexing.py
@@ -904,6 +904,14 @@ def __array_function__(self, func, types, args, kwargs):
         pass
 
 
+class ArrayWithNamespaceAndArrayFunction:
+    def __array_namespace__(self, version=None):
+        pass
+
+    def __array_function__(self, func, types, args, kwargs):
+        pass
+
+
 @pytest.mark.parametrize(
     ["array", "expected_type"],
     (
@@ -926,6 +934,11 @@ def __array_function__(self, func, types, args, kwargs):
             indexing.NdArrayLikeIndexingAdapter,
             id="array_like",
         ),
+        pytest.param(
+            ArrayWithNamespaceAndArrayFunction(),
+            indexing.ArrayApiIndexingAdapter,
+            id="array_api_with_fallback",
+        ),
     ),
 )
 def test_as_indexable(array, expected_type):