Skip to content

fix: use original dict #5658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 13, 2025
Merged

fix: use original dict #5658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72a2aec
fix: use original dict
henryiii May 13, 2025
3626c26
refactor: handle unset dict just in case
henryiii May 13, 2025
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
11 changes: 10 additions & 1 deletion include/pybind11/detail/init.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,16 @@ void setstate(value_and_holder &v_h, std::pair<T, O> &&result, bool need_alias)
// See PR #2972 for details.
return;
}
setattr((PyObject *) v_h.inst, "__dict__", d);
// Our tests never run into an unset dict, but being careful here for now (see #5658)
auto dict = getattr((PyObject *) v_h.inst, "__dict__", none());
if (dict.is_none()) {
setattr((PyObject *) v_h.inst, "__dict__", d);
} else {
// Keep the original object dict and just update it
if (PyDict_Update(dict.ptr(), d.ptr()) < 0) {
throw error_already_set();
}
}
}

/// Implementation for py::pickle(GetState, SetState)
Expand Down
5 changes: 1 addition & 4 deletions tests/test_pickling.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@ void wrap(py::module m) {
.def_readwrite("num", &SimpleBase::num)
.def(py::pickle(
[](const py::object &self) {
py::dict d;
if (py::hasattr(self, "__dict__")) {
d = self.attr("__dict__");
}
py::dict d = py::getattr(self, "__dict__", py::dict());
return py::make_tuple(self.attr("num"), d);
},
[](const py::tuple &t) {
Expand Down
Loading