Merge commit '3fa72d5c2e8188b5aca45e0c50349f9bdfda245f' into curses-term-attrs

Author: serhiy-storchaka

Doc/library/tkinter.messagebox.rst

@@ -113,7 +113,7 @@ Common message box styles and layouts include but are not limited to:
 .. function:: askretrycancel(title=None, message=None, **options)
 
    Ask if operation should be retried. Shows buttons :data:`RETRY` and :data:`CANCEL`.
-   Return ``True`` if the answer is yes and ``False`` otherwise.
+   Return ``True`` if the answer is retry and ``False`` otherwise.
 
 .. function:: askyesno(title=None, message=None, **options)
 

Doc/library/tkinter.rst

@@ -770,6 +770,8 @@ cursor
    The standard X cursor names from :file:`cursorfont.h` can be used, without the
    ``XC_`` prefix.  For example to get a hand cursor (``XC_hand2``), use the
    string ``"hand2"``.  You can also specify a bitmap and mask file of your own.
+   On Windows a cursor file (:file:`.cur` or :file:`.ani`) may be used directly,
+   giving its path preceded with an ``@``, as in ``"@C:/cursors/bart.ani"``.
    See page 179 of Ousterhout's book.
 
 distance
@@ -883,6 +885,20 @@ they are denoted in Tk, which can be useful when referring to the Tk man pages.
 | %d | detail              | %D | delta               |
 +----+---------------------+----+---------------------+
 
+The ``add`` parameter above only affects the bindings you make yourself.
+Every widget also inherits *class bindings*
+that implement its standard behavior --
+for example a :class:`Text` widget binds :kbd:`Control-t`
+to transpose two characters.
+These are described in the bindings section of the widget's Tk man page
+(such as :manpage:`text(3tk)` or :manpage:`entry(3tk)`).
+
+Class bindings are processed separately from your own,
+so binding an event yourself does not replace the default; both run.
+To suppress an unwanted default binding,
+bind the event on the widget
+and return the string ``"break"`` from your callback.
+
 
 The index parameter
 ^^^^^^^^^^^^^^^^^^^

Lib/test/test_curses.py

@@ -1120,9 +1120,10 @@ def test_putwin(self):
     def test_scr_dump(self):
         # Test scr_dump(), scr_restore(), scr_init() and scr_set().
         # scr_dump() writes the virtual screen to a named file; the other three
-        # functions load it back.  The dumped image is internal curses state,
-        # not a window, so the round-trip is checked by comparing dump files
-        # rather than reading cells.
+        # load it back.  The dump is opaque internal curses state -- on some
+        # platforms (such as macOS) it embeds raw pointers that change whenever
+        # the screen is reallocated -- so the round-trip is exercised
+        # functionally rather than by comparing dump bytes.
         stdscr = self.stdscr
         stdscr.erase()
         stdscr.addstr(0, 0, 'screen dump test')
@@ -1131,27 +1132,14 @@ def test_scr_dump(self):
             dump = os.path.join(d, 'dump')
             self.assertIsNone(curses.scr_dump(dump))
             with open(dump, 'rb') as f:
-                image = f.read()
-            self.assertTrue(image)
-            # The dump format embeds raw pointers on some platforms (such as
-            # macOS), so two dumps of the same screen are not always identical.
-            # Only compare dump files when the format proves deterministic.
-            dump2 = os.path.join(d, 'dump2')
-            curses.scr_dump(dump2)
-            with open(dump2, 'rb') as f:
-                deterministic = f.read() == image
-            # scr_restore() reloads that virtual screen, so dumping it again
-            # reproduces the original file even after the screen has changed.
+                self.assertTrue(f.read())
+            # scr_restore() reloads the saved virtual screen, even after the
+            # screen has changed.
             stdscr.erase()
             stdscr.addstr(0, 0, 'something else')
             stdscr.refresh()
             self.assertIsNone(curses.scr_restore(dump))
-            if deterministic:
-                restored = os.path.join(d, 'restored')
-                curses.scr_dump(restored)
-                with open(restored, 'rb') as f:
-                    self.assertEqual(f.read(), image)
-            # scr_init() and scr_set() accept a dump file and return None.
+            # scr_init() and scr_set() also accept a dump file and return None.
             self.assertIsNone(curses.scr_init(dump))
             self.assertIsNone(curses.scr_set(dump))
             # A bytes (path-like) filename is accepted too.

Lib/test/test_zoneinfo/test_zoneinfo.py

@@ -1142,6 +1142,11 @@ def test_extreme_tzstr(self):
     def test_invalid_tzstr(self):
         invalid_tzstrs = [
             "PST8PDT",  # DST but no transition specified
+            # gh-152212: the std offset is required (POSIX TZ grammar)
+            "AAA",
+            "A",
+            "AA",
+            "B",
             "+11",  # Unquoted alphanumeric
             "GMT,M3.2.0/2,M11.1.0/3",  # Transition rule but no DST
             "GMT0+11,M3.2.0/2,M11.1.0/3",  # Unquoted alphanumeric in DST

Lib/tkinter/messagebox.py

@@ -99,24 +99,24 @@ def showerror(title=None, message=None, **options):
 
 
 def askquestion(title=None, message=None, **options):
-    "Ask a question"
+    "Ask a question; return the symbolic name of the selected button"
     return _show(title, message, QUESTION, YESNO, **options)
 
 
 def askokcancel(title=None, message=None, **options):
-    "Ask if operation should proceed; return true if the answer is ok"
+    "Ask if operation should proceed; return True if the answer is ok"
     s = _show(title, message, QUESTION, OKCANCEL, **options)
     return s == OK
 
 
 def askyesno(title=None, message=None, **options):
-    "Ask a question; return true if the answer is yes"
+    "Ask a question; return True if the answer is yes"
     s = _show(title, message, QUESTION, YESNO, **options)
     return s == YES
 
 
 def askyesnocancel(title=None, message=None, **options):
-    "Ask a question; return true if the answer is yes, None if cancelled."
+    "Ask a question; return True if the answer is yes, None if cancelled"
     s = _show(title, message, QUESTION, YESNOCANCEL, **options)
     # s might be a Tcl index object, so convert it to a string
     s = str(s)
@@ -126,7 +126,7 @@ def askyesnocancel(title=None, message=None, **options):
 
 
 def askretrycancel(title=None, message=None, **options):
-    "Ask if operation should be retried; return true if the answer is yes"
+    "Ask if operation should be retried; return True if the answer is retry"
     s = _show(title, message, WARNING, RETRYCANCEL, **options)
     return s == RETRY
 

Lib/zoneinfo/_zoneinfo.py

@@ -672,7 +672,8 @@ def _parse_tz_str(tz_str):
         except ValueError as e:
             raise ValueError(f"Invalid STD offset in {tz_str}") from e
     else:
-        std_offset = 0
+        # The STD offset is required
+        raise ValueError(f"Invalid STD offset in {tz_str}")
 
     if dst_abbr is not None:
         if dst_offset := m.group("dstoff"):

Misc/NEWS.d/next/Library/2026-06-25-12-00-00.gh-issue-152212.Zk7Qm2.rst

@@ -0,0 +1,3 @@
+Fix the pure-Python :mod:`zoneinfo` parser accepting a POSIX TZ string with a
+``std`` abbreviation but no offset. This is invalid per POSIX and now
+raises :exc:`ValueError`, matching the C accelerator. Patch by tonghuaroot.