Merge branch 'python:main' into main

Author: Santhosh-I

.github/workflows/jit.yml

@@ -64,10 +64,10 @@ jobs:
         include:
           - target: i686-pc-windows-msvc/msvc
             architecture: Win32
-            runner: windows-2025-vs2026
+            runner: windows-2025
           - target: x86_64-pc-windows-msvc/msvc
             architecture: x64
-            runner: windows-2025-vs2026
+            runner: windows-2025
           - target: aarch64-pc-windows-msvc/msvc
             architecture: ARM64
             runner: windows-11-arm

.github/workflows/reusable-windows-msi.yml

@@ -17,7 +17,7 @@ env:
 jobs:
   build:
     name: installer for ${{ inputs.arch }}
-    runs-on: ${{ inputs.arch == 'arm64' && 'windows-11-arm' || 'windows-2025-vs2026' }}
+    runs-on: ${{ inputs.arch == 'arm64' && 'windows-11-arm' || 'windows-2025' }}
     timeout-minutes: 60
     env:
       ARCH: ${{ inputs.arch }}

.github/workflows/reusable-windows.yml

@@ -26,7 +26,7 @@ env:
 jobs:
   build:
     name: Build and test (${{ inputs.arch }}, ${{ inputs.interpreter }})
-    runs-on: ${{ inputs.arch == 'arm64' && 'windows-11-arm' || 'windows-2025-vs2026' }}
+    runs-on: ${{ inputs.arch == 'arm64' && 'windows-11-arm' || 'windows-2025' }}
     timeout-minutes: 60
     env:
       ARCH: ${{ inputs.arch }}

Doc/extending/extending.rst

@@ -231,10 +231,8 @@ calling the Python callback functions from a C callback.  Other uses are also
 imaginable.
 
 Fortunately, the Python interpreter is easily called recursively, and there is a
-standard interface to call a Python function.  (I won't dwell on how to call the
-Python parser with a particular string as input --- if you're interested, have a
-look at the implementation of the :option:`-c` command line option in
-:file:`Modules/main.c` from the Python source code.)
+standard interface to call a Python function.  (If you're interested in how to call the
+Python parser with a particular string as input, see :ref:`veryhigh`.)
 
 Calling a Python function is easy.  First, the Python program must somehow pass
 you the Python function object.  You should provide a function (or some other
@@ -641,7 +639,7 @@ and the object is freed.
 
 An alternative strategy is called :dfn:`automatic garbage collection`.
 (Sometimes, reference counting is also referred to as a garbage collection
-strategy, hence my use of "automatic" to distinguish the two.)  The big
+strategy, hence the use of "automatic" to distinguish the two.)  The big
 advantage of automatic garbage collection is that the user doesn't need to call
 :c:func:`free` explicitly.  (Another claimed advantage is an improvement in speed
 or memory usage --- this is no hard fact however.)  The disadvantage is that for

Doc/library/dialog.rst

@@ -15,9 +15,9 @@ The :mod:`!tkinter.simpledialog` module contains convenience classes and
 functions for creating simple modal dialogs to get a value from the user.
 
 
-.. function:: askfloat(title, prompt, *, initialvalue=None, minvalue=None, maxvalue=None, parent=None)
-              askinteger(title, prompt, *, initialvalue=None, minvalue=None, maxvalue=None, parent=None)
-              askstring(title, prompt, *, initialvalue=None, show=None, parent=None)
+.. function:: askfloat(title, prompt, *, initialvalue=None, minvalue=None, maxvalue=None, parent=None, use_ttk=True)
+              askinteger(title, prompt, *, initialvalue=None, minvalue=None, maxvalue=None, parent=None, use_ttk=True)
+              askstring(title, prompt, *, initialvalue=None, show=None, parent=None, use_ttk=True)
 
    Prompt the user to enter a value of the desired type and return it, or
    ``None`` if the dialog is cancelled.
@@ -29,12 +29,22 @@ functions for creating simple modal dialogs to get a value from the user.
    *maxvalue*, which bound the accepted value.
    :func:`askstring` also accepts *show*, a character used to mask the entered
    text, for example ``'*'`` to hide a password.
+   They use the themed :mod:`tkinter.ttk` widgets; pass ``use_ttk=False`` for
+   the classic widgets.
 
-.. class:: Dialog(parent, title=None)
+.. class:: Dialog(parent, title=None, *, use_ttk=False)
 
    The base class for custom dialogs.
    Instantiating it shows the dialog modally and returns once the user closes
    it; the entered value is then available in the :attr:`!result` attribute.
+   When *use_ttk* is false (the default), the dialog is built from the classic
+   :mod:`tkinter` widgets, modelled on the classic ``tk_dialog``; when true,
+   from the themed :mod:`tkinter.ttk` widgets, modelled on the Tk message box.
+   The default is classic for compatibility, since the themed widgets set a
+   themed background that classic widgets added in :meth:`body` would not match.
+
+   .. versionchanged:: next
+      Added the *use_ttk* parameter.
 
    .. attribute:: result
 
@@ -74,14 +84,32 @@ functions for creating simple modal dialogs to get a value from the user.
       the initial focus.
 
 
-.. class:: SimpleDialog(master, text='', buttons=[], default=None, cancel=None, title=None, class_=None)
+.. class:: SimpleDialog(master, text='', buttons=[], default=None, cancel=None, title=None, class_=None, *, bitmap=None, detail='', use_ttk=True)
 
    A simple modal dialog that displays the message *text* above a row of push
-   buttons whose labels are given by *buttons*, and returns the index of the
-   button the user presses.
-   *default* is the index of the button activated by the Return key, *cancel*
-   the index returned when the window is closed through the window manager,
-   *title* the window title, and *class_* the Tk class name of the window.
+   buttons given by *buttons*, and returns the index of the button the user
+   presses.
+   Each entry of *buttons* is either a button label, or a mapping of button
+   options such as ``{'text': 'OK', 'underline': 0}``; an ``underline`` option
+   makes :kbd:`Alt` plus the underlined character invoke the button.
+   *default* is the index of the default button, activated by the Return key
+   when no button has the focus, *cancel* the index returned when the window is
+   closed through the window manager, *title* the window title, and *class_*
+   the Tk class name of the window.
+   *bitmap* is the name of a bitmap displayed beside the message
+   (for example ``'warning'`` or ``'question'``); the standard names
+   ``'error'``, ``'info'``, ``'question'`` and ``'warning'`` are shown as
+   themed icons when *use_ttk* is true.
+   *detail* is a secondary message displayed below *text*.
+   When *use_ttk* is true (the default), the dialog is built from the themed
+   :mod:`tkinter.ttk` widgets, modelled on the Tk message box; when false, from
+   the classic :mod:`tkinter` widgets, modelled on ``tk_dialog``.
+
+   .. versionchanged:: next
+      The dialog is now built from the themed :mod:`tkinter.ttk` widgets by
+      default, instead of the classic :mod:`tkinter` widgets.
+      Added the *bitmap*, *detail* and *use_ttk* parameters.
+      Entries of *buttons* may be mappings of button options.
 
    .. method:: go()
 

Doc/library/tkinter.rst

@@ -1955,6 +1955,37 @@ Base and mixin classes
       color change when the mouse passes over a slider).
       Return the resulting setting.
 
+   .. method:: tk_appname(name=None)
+
+      Query or set the name used to communicate with this application through
+      the ``send`` command.
+      With no argument, return the current name; otherwise change it to *name*
+      and return the actual name set, which may have a suffix appended to keep
+      it unique among the applications on the display.
+
+      .. versionadded:: next
+
+   .. method:: tk_useinputmethods(boolean=None, *, displayof=0)
+
+      Query or set whether Tk uses the X Input Methods (XIM) for filtering
+      events, and return the resulting state.
+      This is significant only on X11; if XIM support is not available it
+      always returns ``False``.
+
+      .. versionadded:: next
+
+   .. method:: tk_caret(*, x=None, y=None, height=None)
+
+      Set or query the caret location for the widget's display.
+      The caret is the per-display insertion position used for global focus
+      indication (for accessibility) and for placing the input method
+      (XIM or IME) window.
+      With no argument, return the current location as a dictionary with the
+      keys ``'x'``, ``'y'`` and ``'height'``; otherwise update the given
+      coordinates.
+
+      .. versionadded:: next
+
    .. method:: tk_scaling(number=None, *, displayof=0)
 
       Query or set the scaling factor used by Tk to convert between physical
@@ -4813,6 +4844,8 @@ Widget classes
    is the initial choice, and *values* are the remaining menu entries.
    The keyword argument *command* may be given a callback that is invoked with
    the selected value, and the keyword argument *name* sets the Tk widget name.
+   Other keyword arguments are passed to the underlying :class:`Menubutton`
+   and may override its default appearance.
 
    .. method:: destroy()
 
@@ -4821,6 +4854,9 @@ Widget classes
    .. versionchanged:: 3.14
       Added support for the *name* keyword argument.
 
+   .. versionchanged:: next
+      Other :class:`Menubutton` options can now be passed as keyword arguments.
+
 
 
 .. class:: PanedWindow(master=None, cnf={}, **kw)
@@ -6151,7 +6187,7 @@ Image classes
 
 
    .. method:: data(format=None, *, from_coords=None, background=None, \
-                    grayscale=False)
+                    grayscale=False, metadata=None)
 
       Return the image data.
 
@@ -6175,16 +6211,27 @@ Image classes
       If *grayscale* is true, the data does not contain color information; all
       pixel data is transformed into grayscale.
 
+      *metadata* is a dictionary passed to the image format driver.
+      It requires Tcl/Tk 9.0 or newer.
+
       .. versionadded:: 3.13
 
+      .. versionchanged:: next
+         Added the *metadata* parameter.
 
-   .. method:: get(x, y)
+
+   .. method:: get(x, y, *, withalpha=False)
 
       Return the color of the pixel at coordinates (*x*, *y*) as an
       ``(r, g, b)`` tuple of three integers between 0 and 255, representing the
       red, green and blue components respectively.
+      If *withalpha* is true, the returned tuple has a fourth element giving
+      the alpha (opacity) value of the pixel.
+
+      .. versionchanged:: next
+         Added the *withalpha* parameter, which requires Tcl/Tk 9.0 or newer.
 
-   .. method:: put(data, to=None)
+   .. method:: put(data, to=None, *, format=None, metadata=None)
 
       Set pixels of the image to the colors given in *data*, which must be a
       string or a nested sequence of horizontal rows of pixel colors (for
@@ -6197,13 +6244,25 @@ Image classes
       bottom-right corner, of the region.
       The default position is ``(0, 0)``.
 
+      *format* specifies the format of the image *data*, so that only image
+      file format handlers whose names begin with it are tried.
+
+      *metadata* is a dictionary passed to the image format driver.
+      It requires Tcl/Tk 9.0 or newer.
+
+      .. versionchanged:: next
+         Added the *format* and *metadata* parameters.
+
    .. method:: read(filename, format=None, *, from_coords=None, to=None, \
-                    shrink=False)
+                    shrink=False, metadata=None)
 
       Read image data from the file named *filename* into the image.
 
       *format* specifies the format of the image data in the file.
 
+      *metadata* is a dictionary passed to the image format driver.
+      It requires Tcl/Tk 9.0 or newer.
+
       *from_coords* specifies a rectangular sub-region of the image file data
       to be copied to the destination image.
       It must be a tuple or a list of 1 to 4 integers ``(x1, y1, x2, y2)``.
@@ -6224,6 +6283,9 @@ Image classes
 
       .. versionadded:: 3.13
 
+      .. versionchanged:: next
+         Added the *metadata* parameter.
+
 
    .. method:: subsample(x, y='', *, from_coords=None)
 
@@ -6256,7 +6318,7 @@ Image classes
 
 
    .. method:: write(filename, format=None, from_coords=None, *, \
-                     background=None, grayscale=False)
+                     background=None, grayscale=False, metadata=None)
 
       Write image data from the image to the file named *filename*.
 
@@ -6278,9 +6340,15 @@ Image classes
       If *grayscale* is true, the data does not contain color information; all
       pixel data is transformed into grayscale.
 
+      *metadata* is a dictionary passed to the image format driver.
+      It requires Tcl/Tk 9.0 or newer.
+
       .. versionchanged:: 3.13
          Added the *background* and *grayscale* parameters.
 
+      .. versionchanged:: next
+         Added the *metadata* parameter.
+
 
    .. method:: zoom(x, y='', *, from_coords=None)
 

Doc/library/tkinter.ttk.rst

@@ -2016,6 +2016,16 @@ If you don't know the class name of a widget, use the method
       Returns a tuple of all known themes.
 
 
+   .. method:: theme_styles(themename=None)
+
+      Returns a tuple of all styles in *themename*.
+      If *themename* is not given, the current theme is used.
+
+      .. versionadded:: next
+
+      Availability: Tk 9.0.
+
+
    .. method:: theme_use(themename=None)
 
       If *themename* is not given, returns the theme in use.  Otherwise, sets

Doc/whatsnew/3.16.rst

@@ -173,6 +173,11 @@ tkinter
   synchronization of the displayed view with the underlying text.
   (Contributed by Serhiy Storchaka in :gh:`151675`.)
 
+* Added the :meth:`ttk.Style.theme_styles
+  <tkinter.ttk.Style.theme_styles>` method which returns the list of styles
+  defined in a theme.
+  (Contributed by Serhiy Storchaka in :gh:`151920`.)
+
 * Added new :class:`!tkinter.Canvas` methods :meth:`~tkinter.Canvas.rchars`
   which replaces the text or coordinates of canvas items, and
   :meth:`~tkinter.Canvas.rotate` which rotates the coordinates of canvas items.
@@ -194,10 +199,42 @@ tkinter
   badge) and :meth:`~tkinter.Wm.wm_stackorder` (toplevel stacking order).
   (Contributed by Serhiy Storchaka in :gh:`151874`.)
 
+* Added the :meth:`~tkinter.Misc.tk_appname`,
+  :meth:`~tkinter.Misc.tk_useinputmethods` and :meth:`~tkinter.Misc.tk_caret`
+  methods, exposing the application send name, the X Input Methods state and
+  the input method caret location.
+  (Contributed by Serhiy Storchaka in :gh:`151886`.)
+
+* Added support for more options in :class:`!tkinter.PhotoImage` methods: the
+  *format* parameter of :meth:`~tkinter.PhotoImage.put`, the *metadata*
+  parameter of :meth:`~tkinter.PhotoImage.put`, :meth:`~tkinter.PhotoImage.read`,
+  :meth:`~tkinter.PhotoImage.write` and :meth:`~tkinter.PhotoImage.data`, and
+  the *withalpha* parameter of :meth:`~tkinter.PhotoImage.get`.
+  (Contributed by Serhiy Storchaka in :gh:`151890`.)
+
 * Added the :meth:`~tkinter.PhotoImage.redither` method which recalculates the
   dithered image when its data was supplied in pieces.
   (Contributed by Serhiy Storchaka in :gh:`151888`.)
 
+* :class:`tkinter.OptionMenu` now accepts arbitrary :class:`!tkinter.Menubutton`
+  options as keyword arguments, which can also override its default appearance.
+  (Contributed by Serhiy Storchaka in :gh:`101284`.)
+
+* The :mod:`tkinter.simpledialog` dialogs were modernized to match the look
+  and feel of the native Tk dialogs.
+  :class:`!tkinter.simpledialog.SimpleDialog` and the
+  :func:`~tkinter.simpledialog.askinteger`,
+  :func:`~tkinter.simpledialog.askfloat` and
+  :func:`~tkinter.simpledialog.askstring` dialogs are now built from the themed
+  :mod:`tkinter.ttk` widgets instead of the classic :mod:`tkinter` widgets;
+  the :class:`!tkinter.simpledialog.Dialog` base class still defaults to the
+  classic widgets for compatibility.  Both :class:`!Dialog` and
+  :class:`!SimpleDialog` gained a *use_ttk* parameter that selects between the
+  classic Tk widgets and the themed ttk widgets.  :class:`!SimpleDialog` also
+  gained *bitmap* and
+  *detail* parameters, draws the standard icons with themed images in the
+  ttk version, and accepts mappings of button options as *buttons* entries.
+  (Contributed by Serhiy Storchaka in :gh:`59396`.)
 
 xml
 ---

Lib/idlelib/idle_test/test_iomenu.py

@@ -23,11 +23,10 @@ def setUpClass(cls):
         cls.root = Tk()
         cls.root.withdraw()
         cls.editwin = EditorWindow(root=cls.root)
-        cls.io = iomenu.IOBinding(cls.editwin)
+        cls.io = cls.editwin.io
 
     @classmethod
     def tearDownClass(cls):
-        cls.io.close()
         cls.editwin._close()
         del cls.editwin
         cls.root.update_idletasks()