fix: use original dict

henryiii · henryiii · commit 72a2aec8481b · 2025-05-13T11:11:43.000-04:00
Signed-off-by: Henry Schreiner &lt;henryschreineriii@gmail.com&gt;
diff --git a/include/pybind11/detail/init.h b/include/pybind11/detail/init.h
@@ -451,7 +451,10 @@ 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);
+    auto dict = getattr((PyObject *) v_h.inst, "__dict__");
+    if (PyDict_Update(dict.ptr(), d.ptr()) < 0) {
+        throw error_already_set();
+    }
 }
 
 /// Implementation for py::pickle(GetState, SetState)

Original file line number	Diff line number	Diff line change
`@@ -451,7 +451,10 @@ void setstate(value_and_holder &v_h, std::pair<T, O> &&result, bool need_alias)`
`451`	`451`	`// See PR #2972 for details.`
`452`	`452`	`return;`
`453`	`453`	`}`
`454`		`- setattr((PyObject *) v_h.inst, "__dict__", d);`
	`454`	`+ auto dict = getattr((PyObject *) v_h.inst, "__dict__");`
	`455`	`+ if (PyDict_Update(dict.ptr(), d.ptr()) < 0) {`
	`456`	`+ throw error_already_set();`
	`457`	`+ }`
`455`	`458`	`}`
`456`	`459`
`457`	`460`	`/// Implementation for py::pickle(GetState, SetState)`