Skip to content

Commit 4692c59

Browse files
authored
MAINT: pandas 1.4: no longer use get_loc with method (#6195)
1 parent 10bfa77 commit 4692c59

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

xarray/core/indexes.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,14 @@ def query(self, labels, method=None, tolerance=None):
231231
)
232232
indexer = self.index.get_loc(label_value)
233233
else:
234-
indexer = self.index.get_loc(
235-
label_value, method=method, tolerance=tolerance
236-
)
234+
if method is not None:
235+
indexer = get_indexer_nd(self.index, label, method, tolerance)
236+
if np.any(indexer < 0):
237+
raise KeyError(
238+
f"not all values found in index {coord_name!r}"
239+
)
240+
else:
241+
indexer = self.index.get_loc(label_value)
237242
elif label.dtype.kind == "b":
238243
indexer = label
239244
else:

xarray/core/missing.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -564,9 +564,8 @@ def _localize(var, indexes_coords):
564564
minval = np.nanmin(new_x.values)
565565
maxval = np.nanmax(new_x.values)
566566
index = x.to_index()
567-
imin = index.get_loc(minval, method="nearest")
568-
imax = index.get_loc(maxval, method="nearest")
569-
567+
imin = index.get_indexer([minval], method="nearest").item()
568+
imax = index.get_indexer([maxval], method="nearest").item()
570569
indexes[dim] = slice(max(imin - 2, 0), imax + 2)
571570
indexes_coords[dim] = (x[indexes[dim]], new_x)
572571
return var.isel(**indexes), indexes_coords

0 commit comments

Comments
 (0)