gh-153418: Fix FrameLocalsProxy error propagation in update and |=

Author: lpyu001

Lib/test/test_frame.py

@@ -18,6 +18,11 @@
 from test import mapping_tests
 
 
+class FailingKeysDict(dict):
+    def keys(self):
+        raise RuntimeError("keys() failed")
+
+
 class ClearTest(unittest.TestCase):
     """
     Tests for frame.clear().
@@ -380,6 +385,9 @@ def test_as_dict(self):
         self.assertEqual(d['x'], 3)
         self.assertEqual(d['z'], 4)
 
+        with self.assertRaisesRegex(RuntimeError, r"keys\(\) failed"):
+            d.update(FailingKeysDict())
+
         with self.assertRaises(TypeError):
             d.update([1, 2])
 
@@ -399,6 +407,8 @@ def test_as_number(self):
         self.assertEqual(d['z'], 3)
         d |= {'y': 3}
         self.assertEqual(d['y'], 3)
+        with self.assertRaisesRegex(RuntimeError, r"keys\(\) failed"):
+            operator.ior(d, FailingKeysDict())
         with self.assertRaises(TypeError):
             d |= 3
         with self.assertRaises(TypeError):

Misc/NEWS.d/next/Core_and_Builtins/2026-07-09-00-00-00.gh-issue-153418.framelocalsproxy-errors.rst

@@ -0,0 +1,3 @@
+Fix ``frame.f_locals |= ...`` mishandling exceptions raised by the right-hand
+mapping, and fix ``frame.f_locals.update()`` unconditionally replacing any
+exception with :exc:`TypeError`.

Objects/frameobject.c

@@ -573,7 +573,7 @@ framelocalsproxy_inplace_or(PyObject *self, PyObject *other)
     }
 
     if (framelocalsproxy_merge(self, other) < 0) {
-        Py_RETURN_NOTIMPLEMENTED;
+        return NULL;
     }
 
     return Py_NewRef(self);
@@ -720,11 +720,15 @@ static PyObject* framelocalsproxy___contains__(PyObject *self, PyObject *key)
 static PyObject*
 framelocalsproxy_update(PyObject *self, PyObject *other)
 {
-    if (framelocalsproxy_merge(self, other) < 0) {
+    if (!PyDict_Check(other) && !PyFrameLocalsProxy_Check(other)) {
         PyErr_SetString(PyExc_TypeError, "update() argument must be dict or another FrameLocalsProxy");
         return NULL;
     }
 
+    if (framelocalsproxy_merge(self, other) < 0) {
+        return NULL;
+    }
+
     Py_RETURN_NONE;
 }