Skip to content

Commit 340baf9

Browse files
committed
Bug 18068: Enumerates on keys for checking dtypes
1 parent a674083 commit 340baf9

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

pandas/core/reshape/merge.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -1253,11 +1253,12 @@ def _get_merge_keys(self):
12531253
join_names) = super(_AsOfMerge, self)._get_merge_keys()
12541254

12551255
# validate index types are the same
1256-
for lk, rk in zip(left_join_keys, right_join_keys):
1256+
for i, (lk, rk) in enumerate(zip(left_join_keys, right_join_keys)):
12571257
if not is_dtype_equal(lk.dtype, rk.dtype):
1258-
raise MergeError("incompatible merge keys {lkdtype} and "
1259-
"{rkdtype}, must be the same type"
1260-
.format(lkdtype=lk.dtype, rkdtype=rk.dtype))
1258+
raise MergeError("incompatible merge keys [{i} {lkdtype} and "
1259+
"{rkdtype}], must be the same type"
1260+
.format(i=i, lkdtype=lk.dtype,
1261+
rkdtype=rk.dtype))
12611262

12621263
# validate tolerance; must be a Timedelta if we have a DTI
12631264
if self.tolerance is not None:

0 commit comments

Comments
 (0)