@@ -422,10 +422,10 @@ def test_left_merge_empty_dataframe(self):
422
422
@pytest .mark .parametrize (
423
423
"kwarg" ,
424
424
[
425
- dict ( left_index = True , right_index = True ) ,
426
- dict ( left_index = True , right_on = "x" ) ,
427
- dict ( left_on = " a" , right_index = True ) ,
428
- dict ( left_on = " a" , right_on = "x" ) ,
425
+ { " left_index" : True , " right_index" : True } ,
426
+ { " left_index" : True , " right_on" : "x" } ,
427
+ { " left_on" : " a" , " right_index" : True } ,
428
+ { " left_on" : " a" , " right_on" : "x" } ,
429
429
],
430
430
)
431
431
def test_merge_left_empty_right_empty (self , join_type , kwarg ):
@@ -475,18 +475,18 @@ def check2(exp, kwarg):
475
475
tm .assert_frame_equal (result , exp )
476
476
477
477
for kwarg in [
478
- dict ( left_index = True , right_index = True ) ,
479
- dict ( left_index = True , right_on = "x" ) ,
478
+ { " left_index" : True , " right_index" : True } ,
479
+ { " left_index" : True , " right_on" : "x" } ,
480
480
]:
481
481
check1 (exp_in , kwarg )
482
482
check2 (exp_out , kwarg )
483
483
484
- kwarg = dict ( left_on = " a" , right_index = True )
484
+ kwarg = { " left_on" : " a" , " right_index" : True }
485
485
check1 (exp_in , kwarg )
486
486
exp_out ["a" ] = [0 , 1 , 2 ]
487
487
check2 (exp_out , kwarg )
488
488
489
- kwarg = dict ( left_on = " a" , right_on = "x" )
489
+ kwarg = { " left_on" : " a" , " right_on" : "x" }
490
490
check1 (exp_in , kwarg )
491
491
exp_out ["a" ] = np .array ([np .nan ] * 3 , dtype = object )
492
492
check2 (exp_out , kwarg )
@@ -524,10 +524,10 @@ def check2(exp, kwarg):
524
524
tm .assert_frame_equal (result , exp )
525
525
526
526
for kwarg in [
527
- dict ( left_index = True , right_index = True ) ,
528
- dict ( left_index = True , right_on = "x" ) ,
529
- dict ( left_on = " a" , right_index = True ) ,
530
- dict ( left_on = " a" , right_on = "x" ) ,
527
+ { " left_index" : True , " right_index" : True } ,
528
+ { " left_index" : True , " right_on" : "x" } ,
529
+ { " left_on" : " a" , " right_index" : True } ,
530
+ { " left_on" : " a" , " right_on" : "x" } ,
531
531
]:
532
532
check1 (exp_in , kwarg )
533
533
check2 (exp_out , kwarg )
@@ -1999,19 +1999,19 @@ def test_merge_series(on, left_on, right_on, left_index, right_index, nm):
1999
1999
@pytest .mark .parametrize (
2000
2000
"col1, col2, kwargs, expected_cols" ,
2001
2001
[
2002
- (0 , 0 , dict ( suffixes = ("" , "_dup" )) , ["0" , "0_dup" ]),
2003
- (0 , 0 , dict ( suffixes = (None , "_dup" )) , [0 , "0_dup" ]),
2004
- (0 , 0 , dict ( suffixes = ("_x" , "_y" )) , ["0_x" , "0_y" ]),
2005
- (0 , 0 , dict ( suffixes = ["_x" , "_y" ]) , ["0_x" , "0_y" ]),
2006
- ("a" , 0 , dict ( suffixes = (None , "_y" )) , ["a" , 0 ]),
2007
- (0.0 , 0.0 , dict ( suffixes = ("_x" , None )) , ["0.0_x" , 0.0 ]),
2008
- ("b" , "b" , dict ( suffixes = (None , "_y" )) , ["b" , "b_y" ]),
2009
- ("a" , "a" , dict ( suffixes = ("_x" , None )) , ["a_x" , "a" ]),
2010
- ("a" , "b" , dict ( suffixes = ("_x" , None )) , ["a" , "b" ]),
2011
- ("a" , "a" , dict ( suffixes = (None , "_x" )) , ["a" , "a_x" ]),
2012
- (0 , 0 , dict ( suffixes = ("_a" , None )) , ["0_a" , 0 ]),
2013
- ("a" , "a" , dict () , ["a_x" , "a_y" ]),
2014
- (0 , 0 , dict () , ["0_x" , "0_y" ]),
2002
+ (0 , 0 , { " suffixes" : ("" , "_dup" )} , ["0" , "0_dup" ]),
2003
+ (0 , 0 , { " suffixes" : (None , "_dup" )} , [0 , "0_dup" ]),
2004
+ (0 , 0 , { " suffixes" : ("_x" , "_y" )} , ["0_x" , "0_y" ]),
2005
+ (0 , 0 , { " suffixes" : ["_x" , "_y" ]} , ["0_x" , "0_y" ]),
2006
+ ("a" , 0 , { " suffixes" : (None , "_y" )} , ["a" , 0 ]),
2007
+ (0.0 , 0.0 , { " suffixes" : ("_x" , None )} , ["0.0_x" , 0.0 ]),
2008
+ ("b" , "b" , { " suffixes" : (None , "_y" )} , ["b" , "b_y" ]),
2009
+ ("a" , "a" , { " suffixes" : ("_x" , None )} , ["a_x" , "a" ]),
2010
+ ("a" , "b" , { " suffixes" : ("_x" , None )} , ["a" , "b" ]),
2011
+ ("a" , "a" , { " suffixes" : (None , "_x" )} , ["a" , "a_x" ]),
2012
+ (0 , 0 , { " suffixes" : ("_a" , None )} , ["0_a" , 0 ]),
2013
+ ("a" , "a" , {} , ["a_x" , "a_y" ]),
2014
+ (0 , 0 , {} , ["0_x" , "0_y" ]),
2015
2015
],
2016
2016
)
2017
2017
def test_merge_suffix (col1 , col2 , kwargs , expected_cols ):
0 commit comments