Skip to content

Commit b6b1ca9

Browse files
committed
always use dask_array_type for instance checking
1 parent 90e734a commit b6b1ca9

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

xarray/core/dask_array_compat.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
import numpy as np
55

6+
from .pycompat import dask_array_type
7+
68
try:
79
import dask.array as da
810
from dask import __version__ as dask_version
@@ -36,7 +38,7 @@ def meta_from_array(x, ndim=None, dtype=None):
3638
"""
3739
# If using x._meta, x must be a Dask Array, some libraries (e.g. zarr)
3840
# implement a _meta attribute that are incompatible with Dask Array._meta
39-
if hasattr(x, "_meta") and isinstance(x, da.Array):
41+
if hasattr(x, "_meta") and isinstance(x, dask_array_type):
4042
x = x._meta
4143

4244
if dtype is None and x is None:

xarray/core/duck_array_ops.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def f(*args, **kwargs):
3737
dispatch_args = args[0]
3838
else:
3939
dispatch_args = args[array_args]
40-
if any(isinstance(a, dask_array.Array) for a in dispatch_args):
40+
if any(isinstance(a, dask_array_type) for a in dispatch_args):
4141
try:
4242
wrapped = getattr(dask_module, name)
4343
except AttributeError as e:
@@ -189,8 +189,8 @@ def lazy_array_equiv(arr1, arr2):
189189
return False
190190
if (
191191
dask_array
192-
and isinstance(arr1, dask_array.Array)
193-
and isinstance(arr2, dask_array.Array)
192+
and isinstance(arr1, dask_array_type)
193+
and isinstance(arr2, dask_array_type)
194194
):
195195
# GH3068
196196
if arr1.name == arr2.name:

0 commit comments

Comments
 (0)