@@ -2414,23 +2414,23 @@ def test_combine_first(self):
24142414 assert_frame_equal (comb , self .frame )
24152415
24162416 def test_combine_first_mixed_bug (self ):
2417- idx = Index (['a' ,'b' ,'c' ,'e' ])
2418- ser1 = Series ([5.0 ,- 9.0 ,4.0 ,100. ],index = idx )
2419- ser2 = Series (['a' , 'b' , 'c' , 'e' ], index = idx )
2420- ser3 = Series ([12 ,4 ,5 ,97 ], index = idx )
2421-
2422- frame1 = DataFrame ({"col0" : ser1 ,
2423- "col2" : ser2 ,
2424- "col3" : ser3 })
2425-
2426- idx = Index (['a' ,'b' ,'c' ,'f' ])
2427- ser1 = Series ([5.0 ,- 9.0 ,4.0 ,100. ], index = idx )
2428- ser2 = Series (['a' ,'b' ,'c' ,'f' ], index = idx )
2429- ser3 = Series ([12 ,4 ,5 ,97 ],index = idx )
2430-
2431- frame2 = DataFrame ({"col1" : ser1 ,
2432- "col2" : ser2 ,
2433- "col5" : ser3 })
2417+ idx = Index (['a' ,'b' ,'c' ,'e' ])
2418+ ser1 = Series ([5.0 ,- 9.0 ,4.0 ,100. ],index = idx )
2419+ ser2 = Series (['a' , 'b' , 'c' , 'e' ], index = idx )
2420+ ser3 = Series ([12 ,4 ,5 ,97 ], index = idx )
2421+
2422+ frame1 = DataFrame ({"col0" : ser1 ,
2423+ "col2" : ser2 ,
2424+ "col3" : ser3 })
2425+
2426+ idx = Index (['a' ,'b' ,'c' ,'f' ])
2427+ ser1 = Series ([5.0 ,- 9.0 ,4.0 ,100. ], index = idx )
2428+ ser2 = Series (['a' ,'b' ,'c' ,'f' ], index = idx )
2429+ ser3 = Series ([12 ,4 ,5 ,97 ],index = idx )
2430+
2431+ frame2 = DataFrame ({"col1" : ser1 ,
2432+ "col2" : ser2 ,
2433+ "col5" : ser3 })
24342434
24352435
24362436 combined = frame1 .combine_first (frame2 )
0 commit comments