@@ -2152,7 +2152,7 @@ def merge(
21522152
21532153 def _align_both_axes (
21542154 self , other : Block , how : str
2155- ) -> Tuple [Block , pd .Index , Sequence [Tuple [ex .Expression , ex .Expression ]]]:
2155+ ) -> Tuple [Block , pd .Index , Sequence [Tuple [ex .RefOrConstant , ex .RefOrConstant ]]]:
21562156 # Join rows
21572157 aligned_block , (get_column_left , get_column_right ) = self .join (other , how = how )
21582158 # join columns schema
@@ -2161,7 +2161,7 @@ def _align_both_axes(
21612161 columns , lcol_indexer , rcol_indexer = self .column_labels , None , None
21622162 else :
21632163 columns , lcol_indexer , rcol_indexer = self .column_labels .join (
2164- other .column_labels , how = "outer" , return_indexers = True
2164+ other .column_labels , how = how , return_indexers = True
21652165 )
21662166 lcol_indexer = (
21672167 lcol_indexer if (lcol_indexer is not None ) else range (len (columns ))
@@ -2183,11 +2183,11 @@ def _align_both_axes(
21832183
21842184 left_inputs = [left_input_lookup (i ) for i in lcol_indexer ]
21852185 right_inputs = [righ_input_lookup (i ) for i in rcol_indexer ]
2186- return aligned_block , columns , tuple (zip (left_inputs , right_inputs ))
2186+ return aligned_block , columns , tuple (zip (left_inputs , right_inputs )) # type: ignore
21872187
21882188 def _align_axis_0 (
21892189 self , other : Block , how : str
2190- ) -> Tuple [Block , pd .Index , Sequence [Tuple [ex .Expression , ex .Expression ]]]:
2190+ ) -> Tuple [Block , pd .Index , Sequence [Tuple [ex .DerefOp , ex .DerefOp ]]]:
21912191 assert len (other .value_columns ) == 1
21922192 aligned_block , (get_column_left , get_column_right ) = self .join (other , how = how )
21932193
@@ -2203,7 +2203,7 @@ def _align_axis_0(
22032203
22042204 def _align_series_block_axis_1 (
22052205 self , other : Block , how : str
2206- ) -> Tuple [Block , pd .Index , Sequence [Tuple [ex .Expression , ex .Expression ]]]:
2206+ ) -> Tuple [Block , pd .Index , Sequence [Tuple [ex .RefOrConstant , ex .RefOrConstant ]]]:
22072207 assert len (other .value_columns ) == 1
22082208 if other ._transpose_cache is None :
22092209 raise ValueError (
@@ -2244,11 +2244,11 @@ def _align_series_block_axis_1(
22442244
22452245 left_inputs = [left_input_lookup (i ) for i in lcol_indexer ]
22462246 right_inputs = [righ_input_lookup (i ) for i in rcol_indexer ]
2247- return aligned_block , columns , tuple (zip (left_inputs , right_inputs ))
2247+ return aligned_block , columns , tuple (zip (left_inputs , right_inputs )) # type: ignore
22482248
22492249 def _align_pd_series_axis_1 (
22502250 self , other : pd .Series , how : str
2251- ) -> Tuple [Block , pd .Index , Sequence [Tuple [ex .Expression , ex .Expression ]]]:
2251+ ) -> Tuple [Block , pd .Index , Sequence [Tuple [ex .RefOrConstant , ex .RefOrConstant ]]]:
22522252 if self .column_labels .equals (other .index ):
22532253 columns , lcol_indexer , rcol_indexer = self .column_labels , None , None
22542254 else :
@@ -2275,7 +2275,7 @@ def _align_pd_series_axis_1(
22752275
22762276 left_inputs = [left_input_lookup (i ) for i in lcol_indexer ]
22772277 right_inputs = [righ_input_lookup (i ) for i in rcol_indexer ]
2278- return self , columns , tuple (zip (left_inputs , right_inputs ))
2278+ return self , columns , tuple (zip (left_inputs , right_inputs )) # type: ignore
22792279
22802280 def _apply_binop (
22812281 self ,
0 commit comments