Skip to content

Commit 9888c41

Browse files
committed
Fix pre-commit formatting
1 parent 80c9afa commit 9888c41

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

pandas/core/reshape/merge.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1962,7 +1962,7 @@ def _validate_validate_kwd(self, validate: str) -> None:
19621962
right_keys = self.orig_right.index
19631963
else:
19641964
right_keys = MultiIndex.from_arrays(self.right_join_keys)
1965-
1965+
19661966
left_unique = left_keys.is_unique
19671967
right_unique = right_keys.is_unique
19681968

@@ -1978,7 +1978,7 @@ def sample_duplicates(keys, limit=10):
19781978
if not left_unique and not right_unique:
19791979
left_sample = sample_duplicates(left_keys, limit=5)
19801980
right_sample = sample_duplicates(right_keys, limit=5)
1981-
1981+
19821982
raise MergeError(
19831983
"Merge keys are not unique in either left "
19841984
"or right dataset; not a one-to-one merge. "
@@ -1988,23 +1988,25 @@ def sample_duplicates(keys, limit=10):
19881988
if not left_unique:
19891989
sample = sample_duplicates(left_keys)
19901990
raise MergeError(
1991-
"Merge keys are not unique in left dataset; not a one-to-one merge. "
1991+
"Merge keys are not unique in left dataset; "
1992+
"not a one-to-one merge. "
19921993
f"Offending keys (sample): {sample}"
19931994
)
19941995
if not right_unique:
19951996
sample = sample_duplicates(right_keys)
19961997
raise MergeError(
1997-
"Merge keys are not unique in right dataset; not a one-to-one merge. "
1998+
"Merge keys are not unique in right dataset; "
1999+
"not a one-to-one merge. "
19982000
f"Offending keys (sample): {sample}"
19992001
)
20002002

20012003
elif validate in ["one_to_many", "1:m"]:
20022004
if not left_unique:
20032005
sample = sample_duplicates(left_keys)
20042006
raise MergeError(
2005-
"Merge keys are not unique in left dataset; not a one-to-many merge. "
2007+
"Merge keys are not unique in left dataset; "
2008+
"not a one-to-many merge. "
20062009
f"Offending keys (sample): {sample}"
2007-
20082010
)
20092011

20102012
elif validate in ["many_to_one", "m:1"]:

pandas/tests/reshape/merge/test_merge.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3122,6 +3122,7 @@ def test_merge_pyarrow_datetime_duplicates():
31223122
expected = expected.convert_dtypes(dtype_backend="pyarrow")
31233123
tm.assert_frame_equal(result, expected)
31243124

3125+
31253126
def test_merge_validate_one_to_one_offending_keys():
31263127
df = pd.DataFrame({"a": [1, 1, 3], "b": [4, 5, 6]})
31273128
with pytest.raises(pd.errors.MergeError, match="Offending keys"):

0 commit comments

Comments
 (0)