@@ -2004,8 +2004,8 @@ def test_merge_series(on, left_on, right_on, left_index, right_index, nm):
2004
2004
("b" , "b" , dict (suffixes = (None , "_y" )), ["b" , "b_y" ]),
2005
2005
("a" , "a" , dict (suffixes = ("_x" , None )), ["a_x" , "a" ]),
2006
2006
("a" , "b" , dict (suffixes = ("_x" , None )), ["a" , "b" ]),
2007
- ("a" , "a" , dict (suffixes = [ None , "_x" ] ), ["a" , "a_x" ]),
2008
- (0 , 0 , dict (suffixes = [ "_a" , None ] ), ["0_a" , 0 ]),
2007
+ ("a" , "a" , dict (suffixes = ( None , "_x" ) ), ["a" , "a_x" ]),
2008
+ (0 , 0 , dict (suffixes = ( "_a" , None ) ), ["0_a" , 0 ]),
2009
2009
("a" , "a" , dict (), ["a_x" , "a_y" ]),
2010
2010
(0 , 0 , dict (), ["0_x" , "0_y" ]),
2011
2011
],
@@ -2057,10 +2057,8 @@ def test_merge_duplicate_suffix(how, expected):
2057
2057
@pytest .mark .parametrize (
2058
2058
"col1, col2, suffixes" ,
2059
2059
[
2060
- ("a" , "a" , [None , None ]),
2061
2060
("a" , "a" , (None , None )),
2062
2061
("a" , "a" , ("" , None )),
2063
- (0 , 0 , [None , None ]),
2064
2062
(0 , 0 , (None , "" )),
2065
2063
],
2066
2064
)
@@ -2082,7 +2080,7 @@ def test_merge_suffix_type_error(col1, col2, suffixes):
2082
2080
a = pd .DataFrame ({col1 : [1 , 2 , 3 ]})
2083
2081
b = pd .DataFrame ({col2 : [3 , 4 , 5 ]})
2084
2082
2085
- msg = f"suffixes should be of type list/tuple . But got { type (suffixes )} "
2083
+ msg = f"suffixes should be tuple of \\ (str, str \\ ) . But got { type (suffixes )} "
2086
2084
with pytest .raises (TypeError , match = msg ):
2087
2085
pd .merge (a , b , left_index = True , right_index = True , suffixes = suffixes )
2088
2086
@@ -2091,7 +2089,7 @@ def test_merge_suffix_type_error(col1, col2, suffixes):
2091
2089
"col1, col2, suffixes, msg" ,
2092
2090
[
2093
2091
("a" , "a" , ("a" , "b" , "c" ), r"too many values to unpack \(expected 2\)" ),
2094
- ("a" , "a" , [ "a" ] , r"not enough values to unpack \(expected 2, got 1\)" ),
2092
+ ("a" , "a" , tuple ( "a" ) , r"not enough values to unpack \(expected 2, got 1\)" ),
2095
2093
],
2096
2094
)
2097
2095
def test_merge_suffix_length_error (col1 , col2 , suffixes , msg ):
0 commit comments