Skip to content

Commit bc80270

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent e4aa9b6 commit bc80270

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

pandas/core/reshape/merge.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1671,9 +1671,8 @@ def _maybe_coerce_merge_keys(self) -> None:
16711671
rk = extract_array(rk, extract_numpy=True)
16721672

16731673
# Explicitly disallow merging int64 and uint64 (or vice versa)
1674-
if (
1675-
(lk.dtype == np.dtype("int64") and rk.dtype == np.dtype("uint64"))
1676-
or (lk.dtype == np.dtype("uint64") and rk.dtype == np.dtype("int64"))
1674+
if (lk.dtype == np.dtype("int64") and rk.dtype == np.dtype("uint64")) or (
1675+
lk.dtype == np.dtype("uint64") and rk.dtype == np.dtype("int64")
16771676
):
16781677
raise ValueError(
16791678
f"You are trying to merge on int64 and uint64 columns for key '{name}'. "

0 commit comments

Comments
 (0)