Skip to content

Commit f68bf25

Browse files
leifwalshjreback
authored andcommitted
ENH: improve 'incompatible tolerance' error message in merge_asof (#17260)
1 parent bbadc81 commit f68bf25

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

pandas/core/reshape/merge.py

+7-5
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def _groupby_and_merge(by, on, left, right, _merge_pieces,
126126
try:
127127
if k in merged:
128128
merged[k] = key
129-
except:
129+
except KeyError:
130130
pass
131131

132132
pieces.append(merged)
@@ -1268,8 +1268,10 @@ def _get_merge_keys(self):
12681268
else:
12691269
lt = left_join_keys[-1]
12701270

1271-
msg = "incompatible tolerance, must be compat " \
1272-
"with type {lt}".format(lt=type(lt))
1271+
msg = ("incompatible tolerance {tolerance}, must be compat "
1272+
"with type {lkdtype}".format(
1273+
tolerance=type(self.tolerance),
1274+
lkdtype=lt.dtype))
12731275

12741276
if is_datetime64_dtype(lt) or is_datetime64tz_dtype(lt):
12751277
if not isinstance(self.tolerance, Timedelta):
@@ -1505,12 +1507,12 @@ def _sort_labels(uniques, left, right):
15051507
# tuplesafe
15061508
uniques = Index(uniques).values
15071509

1508-
l = len(left)
1510+
llength = len(left)
15091511
labels = np.concatenate([left, right])
15101512

15111513
_, new_labels = sorting.safe_sort(uniques, labels, na_sentinel=-1)
15121514
new_labels = _ensure_int64(new_labels)
1513-
new_left, new_right = new_labels[:l], new_labels[l:]
1515+
new_left, new_right = new_labels[:llength], new_labels[llength:]
15141516

15151517
return new_left, new_right
15161518

0 commit comments

Comments
 (0)