File tree Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -653,6 +653,8 @@ def __init__(
653
653
) = self ._create_cross_configuration (self .left , self .right )
654
654
self .left_on = self .right_on = [cross_col ]
655
655
self ._cross = cross_col
656
+ else :
657
+ self ._cross is None
656
658
657
659
# note this function has side effects
658
660
(
@@ -701,12 +703,11 @@ def get_result(self):
701
703
702
704
self ._maybe_restore_index_levels (result )
703
705
704
- self ._maybe_drop_cross_column (result )
706
+ self ._maybe_drop_cross_column (result , self . _cross )
705
707
706
708
return result .__finalize__ (self , method = "merge" )
707
709
708
- def _maybe_drop_cross_column (self , result : "DataFrame" ):
709
- cross_col = getattr (self , "_cross" , None )
710
+ def _maybe_drop_cross_column (self , result : "DataFrame" , cross_col : str ):
710
711
if cross_col is not None :
711
712
result .drop (columns = cross_col , inplace = True )
712
713
You can’t perform that action at this time.
0 commit comments