Complete gh-157217 mappingproxy race fix on current main

Author: KingLizard1020

Lib/idlelib/idle_test/test_pyparse.py

@@ -78,7 +78,7 @@ def char_in_string_false(index): return False
                 '                 b=True):\n'
                 '        pass\n'
                 )
-        pos0, pos = 33, 42  # Start of 'class...', '    def' lines.
+        pos0, pos, pos1 = 33, 42, 94  # Start of 'class', 'def', 'pass' lines.
 
         # Passing no value or non-callable should fail (issue 32989).
         with self.assertRaises(TypeError):
@@ -91,18 +91,18 @@ def char_in_string_false(index): return False
         self.assertIsNone(start(is_char_in_string=lambda index: True))
 
         # Make all text look like it's not in a string.  This means that it
-        # found a good start position.
-        eq(start(char_in_string_false), pos)
+        # found a good start position: the last statement.
+        eq(start(char_in_string_false), pos1)
 
         # If the beginning of the def line is not in a string, then it
         # returns that as the index.
         eq(start(is_char_in_string=lambda index: index > pos), pos)
         # If the beginning of the def line is in a string, then it
         # looks for a previous index.
         eq(start(is_char_in_string=lambda index: index >= pos), pos0)
-        # If everything before the 'def' is in a string, then returns None.
-        # The non-continuation def line returns 44 (see below).
-        eq(start(is_char_in_string=lambda index: index < pos), None)
+        # If everything before the 'def' is in a string, then returns
+        # the start of the 'pass' line.
+        eq(start(is_char_in_string=lambda index: index < pos), pos1)
 
         # Code without extra line break in def line - mostly returns the same
         # values.
@@ -111,12 +111,41 @@ def char_in_string_false(index): return False
                 '    def __init__(self, a, b=True):\n'
                 '        pass\n'
                 )  # Does not affect class, def positions.
-        eq(start(char_in_string_false), pos)
+        pos1 = 77  # Start of 'pass' line.
+        eq(start(char_in_string_false), pos1)
         eq(start(is_char_in_string=lambda index: index > pos), pos)
         eq(start(is_char_in_string=lambda index: index >= pos), pos0)
         # When the def line isn't split, this returns which doesn't match the
         # split line test.
-        eq(start(is_char_in_string=lambda index: index < pos), pos)
+        eq(start(is_char_in_string=lambda index: index < pos), pos1)
+
+        # gh-85560: 'else' of a conditional expression at the start of
+        # a continuation line does not start a statement.
+        setcode('def f():\n'
+                '    return (1 if x\n'
+                '            else 0)\n')
+        eq(start(char_in_string_false), 9)  # Start of 'return' line.
+        setcode('if x:\n'
+                '    pass\n'
+                'else:\n'
+                '    x = 1\n')
+        eq(start(char_in_string_false), 15)
+        setcode('if x:\n'
+                '    pass\n'
+                'else :  # comment\n'
+                '    x = 1\n')
+        eq(start(char_in_string_false), 15)
+        # A yield expression can start a continuation line too.
+        setcode('def f():\n'
+                '    x = (\n'
+                '        yield y)\n')
+        eq(start(char_in_string_false), 0)
+        # Other statements which cannot start a continuation line.
+        for stmt in ('with x:', 'del x', 'global x', 'nonlocal x', 'pass',
+                     'finally:'):
+            with self.subTest(stmt=stmt):
+                setcode(f'if x:\n    pass\n{stmt}\n')
+                eq(start(char_in_string_false), 15)
 
     def test_set_lo(self):
         code = (

Lib/idlelib/pyparse.py

@@ -22,7 +22,7 @@
     ^
     [ \t]*
     (?: while
-    |   else
+    |   else (?= [ \t]* : )   # not "else" of a conditional expression
     |   def
     |   return
     |   assert
@@ -34,7 +34,12 @@
     |   except
     |   raise
     |   import
-    |   yield
+    |   with
+    |   del
+    |   global
+    |   nonlocal
+    |   pass
+    |   finally
     )
     \b
 """, re.VERBOSE | re.MULTILINE).search

Lib/test/test_free_threading/test_type.py

@@ -145,6 +145,7 @@ class ClassB(Base):
         # keep reference to __dict__
         d = obj.__dict__
         obj.__class__ = ClassB
+        self.assertEqual(d['attr'], 123)
 
 
     def test_name_change(self):
@@ -402,6 +403,46 @@ class B(A):
         with threading_helper.start_threads(threads):
             pass
 
+    @unittest.skipUnless(Py_GIL_DISABLED,
+                         "race only occurs on the free-threaded build")
+    def test_dir_racing_class_dict_insert(self):
+        # gh-157217: dir() iterated a mappingproxy of the class dict without
+        # holding that dict's critical section. A concurrent insert into the
+        # class dict (for example a lazy __annotations_cache__) then raised
+        # RuntimeError: dictionary changed size during iteration.
+        errors = []
+
+        class C:
+            x: int
+
+        for i in range(200):
+            setattr(C, f'attr_{i}', i)
+
+        def reader():
+            barrier.wait()
+            for _ in range(400):
+                try:
+                    dir(C)
+                    dict(vars(C))
+                    {**vars(C)}
+                except RuntimeError as exc:
+                    errors.append(exc)
+
+        def writer():
+            barrier.wait()
+            # First access stores __annotations_cache__ on the class.
+            C.__annotations__
+            for i in range(200):
+                setattr(C, f'extra_{i}', i)
+
+        n_readers = 4
+        barrier = threading.Barrier(n_readers + 1)
+        threads = [Thread(target=reader) for _ in range(n_readers)]
+        threads.append(Thread(target=writer))
+        with threading_helper.start_threads(threads):
+            pass
+        self.assertEqual(errors, [])
+
 
 if __name__ == "__main__":
     unittest.main()

Misc/NEWS.d/next/IDLE/2026-09-17-18-00-00.gh-issue-85560.elseexpr.rst

@@ -0,0 +1,3 @@
+Fix IDLE failing to find the opening parenthesis when a continuation line
+inside the parentheses starts with ``else`` of a conditional expression or
+with ``yield``.