[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

pandas/core/reshape/merge.py

@@ -3074,8 +3074,7 @@ def renamer(x, suffix: str | None):
 
     if dups:
         raise MergeError(
-            f"Passing 'suffixes' which cause duplicate columns {dups} is "
-            f"not allowed.",
+            f"Passing 'suffixes' which cause duplicate columns {dups} is not allowed.",
         )
 
     return llabels, rlabels

pandas/tests/reshape/merge/test_merge.py

@@ -3066,8 +3066,8 @@ def test_merge_for_suffix_collisions():
     # GH#61402
     # Case 1: suffixes=("_dup", "") test collision
     df1 = pd.DataFrame({"col1": [1], "col2": [2]})
-    df2 = pd.DataFrame({"col1": [1], "col2": [2], "col2_dup": [3]})    
-    with pytest.raises(MergeError, match="duplicate columns"):    
+    df2 = pd.DataFrame({"col1": [1], "col2": [2], "col2_dup": [3]})
+    with pytest.raises(MergeError, match="duplicate columns"):
         pd.merge(df1, df2, on="col1", suffixes=("_dup", ""))
 
     # Case 2: suffixes=("", "_dup") test collision
@@ -3076,22 +3076,21 @@ def test_merge_for_suffix_collisions():
     with pytest.raises(MergeError, match="duplicate columns"):
         pd.merge(df1, df2, on="col1", suffixes=("", "_dup"))
 
-    # Case 3: suffixes=("_dup" != "__dup"), test similar 
+    # Case 3: suffixes=("_dup" != "__dup"), test similar
     # non-collision
     df3 = pd.DataFrame({"col1": [1], "col2__dup": [4]})
     df4 = pd.DataFrame({"col1": [1], "col2": [2]})
-    merged = df3.merge(df4, on='col1')
+    merged = df3.merge(df4, on="col1")
     expected = pd.DataFrame([{"col1": 1, "col2__dup": 4, "col2": 2}])
-    pd.testing.assert_frame_equal(merged, expected)    
-    
+    pd.testing.assert_frame_equal(merged, expected)
 
-    # Case 4: suffixes=("", ""), auto-suffixes create 
+    # Case 4: suffixes=("", ""), auto-suffixes create
     # collision due to co2_x existing
     df5 = pd.DataFrame({"col1": [1], "col2": [2]})
-    df6 = pd.DataFrame({"col1": [1], "col2": [2], "col2_x": [3]})    
+    df6 = pd.DataFrame({"col1": [1], "col2": [2], "col2_x": [3]})
     with pytest.raises(MergeError, match="duplicate columns"):
         pd.merge(df5, df6, on="col1")
-    
+
     # Case 5: test special characters in suffixes
     df7 = pd.DataFrame({"col1": [1], "metric": [10]})
     df8 = pd.DataFrame({"col1": [1], "metric": [10], "metric#$%^": [20]})
@@ -3100,13 +3099,13 @@ def test_merge_for_suffix_collisions():
 
     # Case 6: check if escape in column name causes conflict
     df7 = pd.DataFrame({"col1": [1], "metric": [10]})
-    df8 = pd.DataFrame({"col1": [1], "metric": [10], "metric\#$%^": [20]})
+    df8 = pd.DataFrame({"col1": [1], "metric": [10], r"metric\#$%^": [20]})
     with pytest.raises(MergeError, match="duplicate columns"):
-        pd.merge(df7, df8, on="col1", suffixes=("\#$%^", ""))
+        pd.merge(df7, df8, on="col1", suffixes=(r"\#$%^", ""))
 
     # Case 7: suffix is a special character string
     df9 = pd.DataFrame({"col1": [1], "col2": [2], "col2": [3]})
     df10 = pd.DataFrame({"col1": [1], "col2": [2]})
-    merged = df9.merge(df10, on='col1')
+    merged = df9.merge(df10, on="col1")
     expected = pd.DataFrame([{"col1": 1, "col2_x": 3, "col2_y": 2}])
-    pd.testing.assert_frame_equal(merged, expected)
+    pd.testing.assert_frame_equal(merged, expected)