@@ -21,11 +21,16 @@ def mask_missing(arr, values_to_mask):
2121 Return a masking array of same size/shape as arr
2222 with entries equaling any member of values_to_mask set to True
2323 """
24- if not isinstance (values_to_mask , (list , np .ndarray )):
24+ if isinstance (values_to_mask , np .ndarray ):
25+ mask_type = values_to_mask .dtype .type
26+ elif isinstance (values_to_mask , list ):
27+ mask_type = type (values_to_mask [0 ])
28+ else :
29+ mask_type = type (values_to_mask )
2530 values_to_mask = [values_to_mask ]
2631
2732 try :
28- values_to_mask = np .array (values_to_mask , dtype = arr . dtype )
33+ values_to_mask = np .array (values_to_mask , dtype = mask_type )
2934 except Exception :
3035 values_to_mask = np .array (values_to_mask , dtype = object )
3136
@@ -409,7 +414,7 @@ def interpolate_2d(values, method='pad', axis=0, limit=None, fill_value=None,
409414 if axis != 0 : # pragma: no cover
410415 raise AssertionError ("cannot interpolate on a ndim == 1 with "
411416 "axis != 0" )
412- values = values .reshape (tuple ((1 , ) + values .shape ))
417+ values = values .reshape (tuple ((1 ,) + values .shape ))
413418
414419 if fill_value is None :
415420 mask = None
@@ -447,7 +452,6 @@ def wrapper(arr, mask, limit=None):
447452
448453
449454def pad_1d (values , limit = None , mask = None , dtype = None ):
450-
451455 if dtype is None :
452456 dtype = values .dtype
453457 _method = None
@@ -472,7 +476,6 @@ def pad_1d(values, limit=None, mask=None, dtype=None):
472476
473477
474478def backfill_1d (values , limit = None , mask = None , dtype = None ):
475-
476479 if dtype is None :
477480 dtype = values .dtype
478481 _method = None
@@ -498,7 +501,6 @@ def backfill_1d(values, limit=None, mask=None, dtype=None):
498501
499502
500503def pad_2d (values , limit = None , mask = None , dtype = None ):
501-
502504 if dtype is None :
503505 dtype = values .dtype
504506 _method = None
@@ -528,7 +530,6 @@ def pad_2d(values, limit=None, mask=None, dtype=None):
528530
529531
530532def backfill_2d (values , limit = None , mask = None , dtype = None ):
531-
532533 if dtype is None :
533534 dtype = values .dtype
534535 _method = None
0 commit comments