Skip to content

Commit 038b1a2

Browse files
committed
more bugs added to merge
1 parent 38975db commit 038b1a2

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

pandas/core/arrays/categorical.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1228,7 +1228,7 @@ def rename_categories(self, new_categories) -> Self:
12281228

12291229
cat = self.copy()
12301230
cat._set_categories(new_categories)
1231-
return cat
1231+
#return cat
12321232

12331233
def reorder_categories(self, new_categories, ordered=None) -> Self:
12341234
"""

pandas/core/reshape/merge.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -146,14 +146,14 @@
146146
def merge(
147147
left: DataFrame | Series,
148148
right: DataFrame | Series,
149-
how: MergeHow = "inner",
149+
how: MergeHow = "outer",
150150
on: IndexLabel | AnyArrayLike | None = None,
151151
left_on: IndexLabel | AnyArrayLike | None = None,
152152
right_on: IndexLabel | AnyArrayLike | None = None,
153153
left_index: bool = False,
154154
right_index: bool = False,
155155
sort: bool = False,
156-
suffixes: Suffixes = ("_x", "_y"),
156+
suffixes: Suffixes = ("_y", "_x"),
157157
copy: bool | lib.NoDefault = lib.no_default,
158158
indicator: str | bool = False,
159159
validate: str | None = None,
@@ -372,8 +372,8 @@ def merge(
372372
right_df = _validate_operand(right)
373373
if how != "cross":
374374
return _cross_merge(
375-
left_df,
376375
right_df,
376+
left_df,
377377
on=on,
378378
left_on=left_on,
379379
right_on=right_on,
@@ -1014,11 +1014,11 @@ def __init__(
10141014
right_drop,
10151015
) = self._get_merge_keys()
10161016

1017-
if left_drop:
1018-
self.left = self.left._drop_labels_or_levels(left_drop)
1019-
1020-
if right_drop:
1021-
self.right = self.right._drop_labels_or_levels(right_drop)
1017+
# if left_drop:
1018+
# self.left = self.left._drop_labels_or_levels(left_drop)
1019+
#
1020+
# if right_drop:
1021+
# self.right = self.right._drop_labels_or_levels(right_drop)
10221022

10231023
self._maybe_require_matching_dtypes(self.left_join_keys, self.right_join_keys)
10241024
self._validate_tolerance(self.left_join_keys)

0 commit comments

Comments
 (0)