Skip to content

Commit 3d81fcd

Browse files
author
Russell Manser
committed
Revert back to isinstance check for iris cube
1 parent fd1db22 commit 3d81fcd

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

xarray/convert.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
from .core import duck_array_ops
1111
from .core.dataarray import DataArray
1212
from .core.dtypes import get_fill_value
13+
from .core.pycompat import dask_array_type
1314

1415
cdms2_ignored_attrs = {"name", "tileIndex"}
1516
iris_forbidden_keys = {
@@ -255,8 +256,6 @@ def from_iris(cube):
255256
"""
256257
import iris.exceptions
257258

258-
from xarray.core.pycompat import is_duck_dask_array
259-
260259
name = _name(cube)
261260
if name == "unknown":
262261
name = None
@@ -291,7 +290,7 @@ def from_iris(cube):
291290
cube_data = cube.core_data() if hasattr(cube, "core_data") else cube.data
292291

293292
# Deal with dask and numpy masked arrays
294-
if is_duck_dask_array(cube_data):
293+
if isinstance(cube_data, dask_array_type):
295294
from dask.array import ma as dask_ma
296295

297296
filled_data = dask_ma.filled(cube_data, get_fill_value(cube.dtype))

0 commit comments

Comments
 (0)