Minor cleanups

carljm · Oct 6, 2022 · fb19617 · fb19617
1 parent 7938d6f
commit fb19617
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
@@ -5783,12 +5783,10 @@ _PyDict_SendEvent(int watcher_bits,
     for (int i = 0; i < DICT_MAX_WATCHERS; i++) {
         if (watcher_bits & 1) {
             PyDict_WatchCallback cb = interp->dict_watchers[i];
-            if (cb) {
-                if (cb(event, (PyObject*)mp, key, value) < 0) {
-                    // some dict modification paths (e.g. PyDict_Clear) can't raise, so we
-                    // can't propagate exceptions from dict watchers.
-                    PyErr_WriteUnraisable((PyObject *)mp);
-                }
+            if (cb && (cb(event, (PyObject*)mp, key, value) < 0)) {
+                // some dict modification paths (e.g. PyDict_Clear) can't raise, so we
+                // can't propagate exceptions from dict watchers.
+                PyErr_WriteUnraisable((PyObject *)mp);
             }
         }
         watcher_bits >>= 1;

diff --git a/Python/pystate.c b/Python/pystate.c
@@ -451,6 +451,10 @@ interpreter_clear(PyInterpreterState *interp, PyThreadState *tstate)
     Py_CLEAR(interp->sysdict);
     Py_CLEAR(interp->builtins);
 
+    for (int i=0; i < DICT_MAX_WATCHERS; i++) {
+        interp->dict_watchers[i] = NULL;
+    }
+
     // XXX Once we have one allocator per interpreter (i.e.
     // per-interpreter GC) we must ensure that all of the interpreter's
     // objects have been cleaned up at the point.