Merge branch 'main' into subscope

Author: iritkatriel

Lib/idlelib/configdialog.py

@@ -2285,10 +2285,13 @@ def make_callback(var, config):
         def default_callback(*params):
             "Add config values to changes instance."
             value = var.get()
-            # A blanked int entry is an empty string; do not save it as an
-            # invalid config value (gh-83653).
             if value != '':
                 changes.add_option(*config, value)
+            else:
+                # A blanked int entry: do not save an invalid value, and
+                # forget the value recorded while editing (gh-75487).
+                config_type, section, item = config
+                changes[config_type].get(section, {}).pop(item, None)
         return default_callback
 
     def attach(self):

Lib/idlelib/idle_test/test_configdialog.py

@@ -1711,6 +1711,10 @@ def test_make_callback(self):
         sv.set('5')
         cb()
         self.assertEqual(changes['main']['section']['option'], '5')
+        # gh-75487: blanking the entry forgets the value recorded before.
+        sv.set('')
+        cb()
+        self.assertNotIn('option', changes['main']['section'])
         changes.clear()
 
     def test_attach_detach(self):

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

Misc/NEWS.d/next/IDLE/2026-09-17-17-00-00.gh-issue-75487.blankint.rst

@@ -0,0 +1,2 @@
+Fix saving a truncated number when an integer entry in the IDLE Settings
+dialog is blanked with the Backspace key.

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``.

configure

@@ -6555,13 +6555,13 @@ AC_CHECK_FUNCS(
   [AC_MSG_ERROR([Python requires C99 compatible libm])]
 )
 
-PY_CHECK_FUNC_PRIVATE([acospi])
-PY_CHECK_FUNC_PRIVATE([asinpi])
-PY_CHECK_FUNC_PRIVATE([atanpi])
-PY_CHECK_FUNC_PRIVATE([atan2pi])
-PY_CHECK_FUNC_PRIVATE([cospi])
-PY_CHECK_FUNC_PRIVATE([sinpi])
-PY_CHECK_FUNC_PRIVATE([tanpi])
+PY_CHECK_FUNC_PRIVATE([acospi], [@%:@include <math.h>])
+PY_CHECK_FUNC_PRIVATE([asinpi], [@%:@include <math.h>])
+PY_CHECK_FUNC_PRIVATE([atanpi], [@%:@include <math.h>])
+PY_CHECK_FUNC_PRIVATE([atan2pi], [@%:@include <math.h>])
+PY_CHECK_FUNC_PRIVATE([cospi], [@%:@include <math.h>])
+PY_CHECK_FUNC_PRIVATE([sinpi], [@%:@include <math.h>])
+PY_CHECK_FUNC_PRIVATE([tanpi], [@%:@include <math.h>])
 LIBS=$LIBS_SAVE
 
 dnl For multiprocessing module, check that sem_open