Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions pandas/core/methods/to_dict.py
Original file line number Diff line number Diff line change
Expand Up @@ -259,28 +259,40 @@ def to_dict(
columns = df.columns.tolist()
if are_all_object_dtype_cols:
return into_c(
(t[0], dict(zip(df.columns, map(maybe_box_native, t[1:]), strict=True)))
(
t[0],
into_c(
zip(
df.columns,
map(maybe_box_native, t[1:]),
strict=True,
)
),
)
for t in df.itertuples(name=None)
)
elif box_native_indices:
object_dtype_indices_as_set = set(box_native_indices)
return into_c(
(
t[0],
{
column: maybe_box_native(v)
if i in object_dtype_indices_as_set
else v
into_c(
(
column,
maybe_box_native(v)
if i in object_dtype_indices_as_set
else v,
)
for i, (column, v) in enumerate(
zip(columns, t[1:], strict=True)
)
},
),
)
for t in df.itertuples(name=None)
)
else:
return into_c(
(t[0], dict(zip(columns, t[1:], strict=True)))
(t[0], into_c(zip(columns, t[1:], strict=True)))
for t in df.itertuples(name=None)
)

Expand Down
32 changes: 32 additions & 0 deletions pandas/tests/frame/methods/test_to_dict.py
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,38 @@ def test_to_dict_tight_no_warning_with_duplicate_column(self):
}
assert result == expected

def test_to_dict_index_into_nested(self):
# GH#65778
df = DataFrame({"A": [1, 2], "B": ["x", "y"]})

result = df.to_dict(orient="index", into=OrderedDict)
assert isinstance(result, OrderedDict)
assert all(isinstance(v, OrderedDict) for v in result.values())

result = df.to_dict(orient="index", into=defaultdict(dict))
assert isinstance(result, defaultdict)
assert all(isinstance(v, defaultdict) for v in result.values())

def test_to_dict_index_into_nested_mixed_dtypes(self):
# GH#65778
df = DataFrame({"A": [1, 2], "B": ["x", "y"], "C": [1.0, 2.0]})

result = df.to_dict(orient="index", into=OrderedDict)
assert isinstance(result, OrderedDict)
assert all(isinstance(v, OrderedDict) for v in result.values())
assert result[0] == OrderedDict([("A", 1), ("B", "x"), ("C", 1.0)])
assert result[1] == OrderedDict([("A", 2), ("B", "y"), ("C", 2.0)])

def test_to_dict_index_into_nested_all_object(self):
# GH#65778
df = DataFrame({"A": ["a", "b"], "B": ["x", "y"]})

result = df.to_dict(orient="index", into=OrderedDict)
assert isinstance(result, OrderedDict)
assert all(isinstance(v, OrderedDict) for v in result.values())
assert result[0] == OrderedDict([("A", "a"), ("B", "x")])
assert result[1] == OrderedDict([("A", "b"), ("B", "y")])


@pytest.mark.parametrize(
"val", [Timestamp(2020, 1, 1), Timedelta(1), Period("2020"), Interval(1, 2)]
Expand Down
Loading