@@ -1041,48 +1041,21 @@ def test_merge_two_empty_df_no_division_error(self):
1041
1041
'index,expected_index' ,
1042
1042
[(CategoricalIndex ([1 , 2 , 4 ]),
1043
1043
CategoricalIndex ([1 , 2 , 4 , None , None , None ])),
1044
- (DatetimeIndex (['2001-01-01' ,
1045
- '2002-02-02' ,
1046
- '2003-03-03' ]),
1047
- DatetimeIndex (['2001-01-01' ,
1048
- '2002-02-02' ,
1049
- '2003-03-03' ,
1050
- pd .NaT ,
1051
- pd .NaT ,
1052
- pd .NaT ])),
1044
+ (DatetimeIndex (['2001-01-01' , '2002-02-02' , '2003-03-03' ]),
1045
+ DatetimeIndex (['2001-01-01' , '2002-02-02' , '2003-03-03' ,
1046
+ pd .NaT , pd .NaT , pd .NaT ])),
1053
1047
(Float64Index ([1 , 2 , 3 ]),
1054
1048
Float64Index ([1 , 2 , 3 , None , None , None ])),
1055
1049
(Int64Index ([1 , 2 , 3 ]),
1056
1050
Float64Index ([1 , 2 , 3 , None , None , None ])),
1057
- (IntervalIndex .from_tuples ([(1 , 2 ),
1058
- (2 , 3 ),
1059
- (3 , 4 )]),
1060
- IntervalIndex .from_tuples ([(1 , 2 ),
1061
- (2 , 3 ),
1062
- (3 , 4 ),
1063
- np .nan ,
1064
- np .nan ,
1065
- np .nan ])),
1066
- (PeriodIndex (['2001-01-01' ,
1067
- '2001-01-02' ,
1068
- '2001-01-03' ],
1069
- freq = 'D' ),
1070
- PeriodIndex (['2001-01-01' ,
1071
- '2001-01-02' ,
1072
- '2001-01-03' ,
1073
- pd .NaT ,
1074
- pd .NaT ,
1075
- pd .NaT ],
1076
- freq = 'D' )),
1077
- (TimedeltaIndex (['1d' ,
1078
- '2d' ,
1079
- '3d' ]),
1080
- TimedeltaIndex (['1d' ,
1081
- '2d' ,
1082
- '3d' ,
1083
- pd .NaT ,
1084
- pd .NaT ,
1085
- pd .NaT ]))])
1051
+ (IntervalIndex .from_tuples ([(1 , 2 ), (2 , 3 ), (3 , 4 )]),
1052
+ IntervalIndex .from_tuples ([(1 , 2 ), (2 , 3 ), (3 , 4 ),
1053
+ np .nan , np .nan , np .nan ])),
1054
+ (PeriodIndex (['2001-01-01' , '2001-01-02' , '2001-01-03' ], freq = 'D' ),
1055
+ PeriodIndex (['2001-01-01' , '2001-01-02' , '2001-01-03' ,
1056
+ pd .NaT , pd .NaT , pd .NaT ], freq = 'D' )),
1057
+ (TimedeltaIndex (['1d' , '2d' , '3d' ]),
1058
+ TimedeltaIndex (['1d' , '2d' , '3d' , pd .NaT , pd .NaT , pd .NaT ]))])
1086
1059
def test_merge_on_index_with_more_values (self , how , index , expected_index ):
1087
1060
# GH 24212
1088
1061
# pd.merge gets [0, 1, 2, -1, -1, -1] as left_indexer, ensure that
@@ -1117,6 +1090,7 @@ def test_merge_right_index_right(self):
1117
1090
tm .assert_frame_equal (result , expected )
1118
1091
1119
1092
def test_merge_take_missing_values_from_index_of_other_dtype (self ):
1093
+ # GH 24212
1120
1094
left = pd .DataFrame ({'a' : [1 , 2 , 3 ],
1121
1095
'key' : pd .Categorical (['a' , 'a' , 'b' ],
1122
1096
categories = list ('abc' ))})
0 commit comments