Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-125608: Trigger dictionary watchers when inline values change (#125611) 

Dictionary watchers on an object's attributes dictionary
(`object.__dict__`) were not triggered when the managed dictionary used
the object's inline values.
This commit is contained in:
Sam Gross 2024-10-21 08:23:38 -04:00 committed by GitHub
parent 0cd21406bf
commit 5989eb7446
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Lib/test/test_capi/test_watchers.py
View File

@ -97,6 +97,23 @@ class TestDictWatchers(unittest.TestCase):
del d
self.assert_events(["dealloc"])
def test_object_dict(self):
class MyObj: pass
o = MyObj()
with self.watcher() as wid:
self.watch(wid, o.__dict__)
o.foo = "bar"
o.foo = "baz"
del o.foo
self.assert_events(["new:foo:bar", "mod:foo:baz", "del:foo"])
with self.watcher() as wid:
self.watch(wid, o.__dict__)
for _ in range(100):
o.foo = "bar"
self.assert_events(["new:foo:bar"] + ["mod:foo:bar"] * 99)
def test_unwatch(self):
d = {}
with self.watcher() as wid:

3
Misc/NEWS.d/next/C_API/2024-10-16-19-28-23.gh-issue-125608.gTsU2g.rst Normal file
View File

@ -0,0 +1,3 @@
Fix a bug where dictionary watchers (e.g., :c:func:`PyDict_Watch`) on an
object's attribute dictionary (:attr:`~object.__dict__`) were not triggered
when the object's attributes were modified.

17
Objects/dictobject.c
View File

@ -6835,15 +6835,24 @@ store_instance_attr_lock_held(PyObject *obj, PyDictValues *values,
}
PyObject *old_value = values->values[ix];
FT_ATOMIC_STORE_PTR_RELEASE(values->values[ix], Py_XNewRef(value));
if (old_value == NULL) {
if (value == NULL) {
if (old_value == NULL && value == NULL) {
PyErr_Format(PyExc_AttributeError,
"'%.100s' object has no attribute '%U'",
Py_TYPE(obj)->tp_name, name);
return -1;
}
if (dict) {
PyInterpreterState *interp = _PyInterpreterState_GET();
PyDict_WatchEvent event = (old_value == NULL ? PyDict_EVENT_ADDED :
value == NULL ? PyDict_EVENT_DELETED :
PyDict_EVENT_MODIFIED);
_PyDict_NotifyEvent(interp, event, dict, name, value);
}
FT_ATOMIC_STORE_PTR_RELEASE(values->values[ix], Py_XNewRef(value));
if (old_value == NULL) {
_PyDictValues_AddToInsertionOrder(values, ix);
if (dict) {
assert(dict->ma_values == values);