Skip to content

Commit 4acdb55

Browse files
committed
Fixups
1 parent 62140f8 commit 4acdb55

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

pandas/core/apply.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,9 @@ def new_dict_like(self, method: str) -> DataFrame | Series:
609609
is_ndframe = [isinstance(r, ABCNDFrame) for r in results]
610610

611611
# combine results
612+
result: DataFrame | Series
612613
if all(is_ndframe):
614+
keys_to_use: Iterable[Hashable]
613615
keys_to_use = [k for k in arg.keys() if not results[k].empty]
614616
keys_to_use = keys_to_use if keys_to_use != [] else arg.keys()
615617
if selected_obj.ndim == 2:
@@ -619,8 +621,6 @@ def new_dict_like(self, method: str) -> DataFrame | Series:
619621
keys_to_use = ktu
620622
keys = None if selected_obj.ndim == 1 else keys_to_use
621623
result = concat({k: results[k] for k in keys_to_use}, keys=keys, axis=1)
622-
if result.ndim == 1:
623-
result = result.to_frame()
624624
elif any(is_ndframe):
625625
# There is a mix of NDFrames and scalars
626626
raise ValueError(

pandas/tests/apply/test_frame_apply.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1450,9 +1450,9 @@ def test_apply_no_suffix_index(request):
14501450
result = pdf.apply([np.square, lambda x: x, lambda x: x])
14511451
if get_option("mode.new_udf_methods"):
14521452
columns = MultiIndex.from_product(
1453-
[["A", "B"], ["square", "<lambda>", "<lambda>"]]
1453+
[["square", "<lambda>", "<lambda>"], ["A", "B"]]
14541454
)
1455-
expected = DataFrame([[16, 4, 4, 81, 9, 9]], columns=columns)
1455+
expected = DataFrame(3 * [[16, 81, 4, 9, 4, 9]], columns=columns)
14561456
else:
14571457
columns = MultiIndex.from_product(
14581458
[["A", "B"], ["square", "<lambda>", "<lambda>"]]

0 commit comments

Comments
 (0)