Skip to content

Commit 949185e

Browse files
committed
Change function signature
1 parent 0acdd00 commit 949185e

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

pandas/core/reshape/merge.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -653,6 +653,8 @@ def __init__(
653653
) = self._create_cross_configuration(self.left, self.right)
654654
self.left_on = self.right_on = [cross_col]
655655
self._cross = cross_col
656+
else:
657+
self._cross is None
656658

657659
# note this function has side effects
658660
(
@@ -701,12 +703,11 @@ def get_result(self):
701703

702704
self._maybe_restore_index_levels(result)
703705

704-
self._maybe_drop_cross_column(result)
706+
self._maybe_drop_cross_column(result, self._cross)
705707

706708
return result.__finalize__(self, method="merge")
707709

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):
710711
if cross_col is not None:
711712
result.drop(columns=cross_col, inplace=True)
712713

0 commit comments

Comments
 (0)