Skip to content

Commit 52dbb3d

Browse files
committed
Cleanups
1 parent ac0dc97 commit 52dbb3d

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

pandas/core/apply.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,6 @@ def wrap_results_dict_like(
637637
results,
638638
axis=axis,
639639
keys=keys_to_use,
640-
sort=False,
641640
)
642641
elif any(is_ndframe):
643642
# There is a mix of NDFrames and scalars

pandas/core/indexes/api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ def union_indexes(indexes, sort: bool | None | lib.NoDefault = True) -> Index:
204204
if len(indexes) == 1:
205205
result = indexes[0]
206206
if isinstance(result, list):
207-
if not sort:
207+
if not sort or sort is lib.no_default:
208208
result = Index(result)
209209
else:
210210
result = Index(sorted(result))

pandas/core/reshape/concat.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,8 @@ def concat(
434434
"silence this message."
435435
)
436436
warnings.warn(msg, Pandas4Warning, stacklevel=find_stack_level())
437+
else:
438+
sort = False
437439
else:
438440
if not is_bool(sort):
439441
raise ValueError(

pandas/tests/reshape/merge/test_merge.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -375,9 +375,9 @@ def test_merge_non_unique_indexes(self):
375375
dt3 = datetime(2012, 5, 3)
376376
dt4 = datetime(2012, 5, 4)
377377

378-
# df1 = DataFrame({"x": ["a"]}, index=[dt])
379-
# df2 = DataFrame({"y": ["b", "c"]}, index=[dt, dt])
380-
# _check_merge(df1, df2)
378+
df1 = DataFrame({"x": ["a"]}, index=[dt])
379+
df2 = DataFrame({"y": ["b", "c"]}, index=[dt, dt])
380+
_check_merge(df1, df2)
381381

382382
# Not monotonic
383383
df1 = DataFrame({"x": ["a", "b", "q"]}, index=[dt2, dt, dt4])
@@ -1480,16 +1480,13 @@ def test_merge_how_validation(self):
14801480
def _check_merge(x, y):
14811481
for how in ["inner", "left", "outer"]:
14821482
for sort in [True, False]:
1483-
how = "inner"
1484-
sort = False
14851483
result = x.join(y, how=how, sort=sort)
14861484

14871485
expected = merge(x.reset_index(), y.reset_index(), how=how, sort=sort)
14881486
expected = expected.set_index("index")
14891487

14901488
# TODO check_names on merge?
14911489
tm.assert_frame_equal(result, expected, check_names=False)
1492-
break
14931490

14941491

14951492
class TestMergeDtypes:

0 commit comments

Comments
 (0)