Skip to content

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit c377804

Browse filesBrowse files
pre-commit-ci[bot]Farsidetfs
authored andcommitted
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 6ab7165 commit c377804
Copy full SHA for c377804

File tree

1 file changed

+2
-2
lines changed
Filter options

1 file changed

+2
-2
lines changed

‎pandas/tests/reshape/merge/test_merge.py

Copy file name to clipboardExpand all lines: pandas/tests/reshape/merge/test_merge.py
+2-2
Original file line numberDiff line numberDiff line change
@@ -3066,8 +3066,8 @@ def test_merge_for_suffix_collisions():
30663066
# GH#61402
30673067
# Case 1: suffixes=("_dup", "") test collision
30683068
df1 = DataFrame({"col1": [1], "col2": [2]})
3069-
df2 = DataFrame({"col1": [1], "col2": [2], "col2_dup": [3]})
3070-
with pytest.raises(MergeError, match="duplicate columns"):
3069+
df2 = DataFrame({"col1": [1], "col2": [2], "col2_dup": [3]})
3070+
with pytest.raises(MergeError, match="duplicate columns"):
30713071
merge(df1, df2, on="col1", suffixes=("_dup", ""))
30723072

30733073
# Case 2: suffixes=("", "_dup") test collision

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.