Merge remote-tracking branch 'upstream/main' into properly_disable

Author: Fidget-Spinner

Doc/c-api/init.rst

@@ -604,7 +604,7 @@ Process-wide parameters
    interpreter will change the contents of this storage.
 
    Use :c:func:`Py_DecodeLocale` to decode a bytes string to get a
-   :c:expr:`wchar_*` string.
+   :c:expr:`wchar_t*` string.
 
    .. deprecated-removed:: 3.11 3.15
 
@@ -852,7 +852,7 @@ Process-wide parameters
      directory (``"."``).
 
    Use :c:func:`Py_DecodeLocale` to decode a bytes string to get a
-   :c:expr:`wchar_*` string.
+   :c:expr:`wchar_t*` string.
 
    See also :c:member:`PyConfig.orig_argv` and :c:member:`PyConfig.argv`
    members of the :ref:`Python Initialization Configuration <init-config>`.
@@ -888,7 +888,7 @@ Process-wide parameters
    :option:`-I`.
 
    Use :c:func:`Py_DecodeLocale` to decode a bytes string to get a
-   :c:expr:`wchar_*` string.
+   :c:expr:`wchar_t*` string.
 
    See also :c:member:`PyConfig.orig_argv` and :c:member:`PyConfig.argv`
    members of the :ref:`Python Initialization Configuration <init-config>`.
@@ -914,7 +914,7 @@ Process-wide parameters
    this storage.
 
    Use :c:func:`Py_DecodeLocale` to decode a bytes string to get a
-   :c:expr:`wchar_*` string.
+   :c:expr:`wchar_t*` string.
 
    .. deprecated-removed:: 3.11 3.15
 

Doc/library/dbm.rst

@@ -455,7 +455,7 @@ The :mod:`!dbm.dumb` module defines the following:
    .. method:: dumbdbm.sync()
 
       Synchronize the on-disk directory and data files.  This method is called
-      by the :meth:`Shelve.sync` method.
+      by the :meth:`shelve.Shelf.sync` method.
 
    .. method:: dumbdbm.close()
 

Doc/library/plistlib.rst

@@ -99,7 +99,7 @@ This module defines the following functions:
 
 .. function:: dump(value, fp, *, fmt=FMT_XML, sort_keys=True, skipkeys=False, aware_datetime=False)
 
-   Write *value* to a plist file. *Fp* should be a writable, binary
+   Write *value* to a plist file. *fp* should be a writable, binary
    file object.
 
    The *fmt* argument specifies the format of the plist file and can be

Doc/library/smtplib.rst

@@ -524,7 +524,7 @@ An :class:`SMTP` instance has the following methods:
    :mailheader:`Bcc` or :mailheader:`Resent-Bcc` headers that may appear
    in *msg*.  If any of the addresses in *from_addr* and *to_addrs* contain
    non-ASCII characters and the server does not advertise ``SMTPUTF8`` support,
-   an :exc:`SMTPNotSupported` error is raised.  Otherwise the ``Message`` is
+   an :exc:`SMTPNotSupportedError` is raised.  Otherwise the ``Message`` is
    serialized with a clone of its :mod:`~email.policy` with the
    :attr:`~email.policy.EmailPolicy.utf8` attribute set to ``True``, and
    ``SMTPUTF8`` and ``BODY=8BITMIME`` are added to *mail_options*.

Doc/tools/.nitignore

@@ -16,7 +16,6 @@ Doc/library/ast.rst
 Doc/library/asyncio-extending.rst
 Doc/library/asyncio-subprocess.rst
 Doc/library/collections.rst
-Doc/library/dbm.rst
 Doc/library/decimal.rst
 Doc/library/email.charset.rst
 Doc/library/email.compat32-message.rst

Doc/whatsnew/3.12.rst

@@ -1819,7 +1819,7 @@ Build Changes
 * ``PYTHON_FOR_REGEN`` now require Python 3.10 or newer.
 
 * Autoconf 2.71 and aclocal 1.16.4 is now required to regenerate
-  :file:`!configure`.
+  :file:`configure`.
   (Contributed by Christian Heimes in :gh:`89886`.)
 
 * Windows builds and macOS installers from python.org now use OpenSSL 3.0.

Doc/whatsnew/3.14.rst

@@ -367,7 +367,7 @@ ctypes
 
 * The layout of :ref:`bit fields <ctypes-bit-fields-in-structures-unions>`
   in :class:`~ctypes.Structure` and :class:`~ctypes.Union`
-  now matches platform defaults (GCC/Clang or MVSC) more closely.
+  now matches platform defaults (GCC/Clang or MSVC) more closely.
   In particular, fields no longer overlap.
   (Contributed by Matthias Görgens in :gh:`97702`.)
 
@@ -411,6 +411,13 @@ decimal
   :meth:`Decimal.from_number() <decimal.Decimal.from_number>`.
   (Contributed by Serhiy Storchaka in :gh:`121798`.)
 
+difflib
+-------
+
+* Comparison pages with highlighted changes generated by the
+  :class:`difflib.HtmlDiff` class now support dark mode.
+  (Contributed by Jiahao Li in :gh:`129939`.)
+
 dis
 ---
 
@@ -481,6 +488,14 @@ http
   (Contributed by Yorik Hansen in :gh:`123430`.)
 
 
+imaplib
+-------
+
+* Add :meth:`IMAP4.idle() <imaplib.IMAP4.idle>`, implementing the IMAP4
+  ``IDLE`` command as defined in :rfc:`2177`.
+  (Contributed by Forest in :gh:`55454`.)
+
+
 inspect
 -------
 
@@ -496,13 +511,6 @@ inspect
   :term:`package` or not.
   (Contributed by Zhikang Yan in :gh:`125634`.)
 
-imaplib
--------
-
-* Add :meth:`IMAP4.idle() <imaplib.IMAP4.idle>`, implementing the IMAP4
-  ``IDLE`` command as defined in :rfc:`2177`.
-  (Contributed by Forest in :gh:`55454`.)
-
 
 io
 --
@@ -631,7 +639,6 @@ pathlib
   :func:`~os.stat` results. Path objects generated by
   :meth:`~pathlib.Path.iterdir` are initialized with file type information
   gleaned from scanning the parent directory.
-
   (Contributed by Barney Gale in :gh:`125413`.)
 
 
@@ -670,7 +677,6 @@ platform
 --------
 
 * Add :func:`platform.invalidate_caches` to invalidate the cached results.
-
   (Contributed by Bénédikt Tran in :gh:`122549`.)
 
 
@@ -809,13 +815,11 @@ zipinfo
 * Added :func:`ZipInfo._for_archive <zipfile.ZipInfo._for_archive>`
   to resolve suitable defaults for a :class:`~zipfile.ZipInfo` object
   as used by :func:`ZipFile.writestr <zipfile.ZipFile.writestr>`.
-
   (Contributed by Bénédikt Tran in :gh:`123424`.)
 
 * :meth:`zipfile.ZipFile.writestr` now respect ``SOURCE_DATE_EPOCH`` that
   distributions can set centrally and have build tools consume this in order
   to produce reproducible output.
-
   (Contributed by Jiahao Li in :gh:`91279`.)
 
 .. Add improved modules above alphabetically, not here at the end.
@@ -1004,7 +1008,6 @@ ast
   * :attr:`!ast.Constant.s`
 
   Use :attr:`!ast.Constant.value` instead.
-
   (Contributed by Alex Waygood in :gh:`119562`.)
 
 asyncio
@@ -1213,7 +1216,6 @@ urllib
   :func:`~urllib.request.urlretrieve`. Customizations to the opener
   classes can be replaced by passing customized handlers to
   :func:`~urllib.request.build_opener`.
-
   (Contributed by Barney Gale in :gh:`84850`.)
 
 Others
@@ -1466,6 +1468,8 @@ Porting to Python 3.14
 .. _pythoncapi-compat project: https://github.com/python/pythoncapi-compat/
 
 
+.. _whatsnew314-c-api-deprecated:
+
 Deprecated
 ----------
 
@@ -1505,17 +1509,17 @@ Deprecated
 
   The `pythoncapi-compat project`_ can be used to get these new public
   functions on Python 3.13 and older.
-
   (Contributed by Victor Stinner in :gh:`128863`.)
 
-
 .. include:: ../deprecations/c-api-pending-removal-in-3.15.rst
 
 .. include:: ../deprecations/c-api-pending-removal-in-3.18.rst
 
 .. include:: ../deprecations/c-api-pending-removal-in-future.rst
 
 
+.. _whatsnew314-c-api-removed:
+
 Removed
 -------
 

Lib/difflib.py

@@ -1632,13 +1632,22 @@ def _line_pair_iterator():
 </html>"""
 
 _styles = """
+        :root {color-scheme: light dark}
         table.diff {font-family:Courier; border:medium;}
         .diff_header {background-color:#e0e0e0}
         td.diff_header {text-align:right}
         .diff_next {background-color:#c0c0c0}
-        .diff_add {background-color:#aaffaa}
+        .diff_add {background-color:palegreen}
         .diff_chg {background-color:#ffff77}
-        .diff_sub {background-color:#ffaaaa}"""
+        .diff_sub {background-color:#ffaaaa}
+
+        @media (prefers-color-scheme: dark) {
+            .diff_header {background-color:#666}
+            .diff_next {background-color:#393939}
+            .diff_add {background-color:darkgreen}
+            .diff_chg {background-color:#847415}
+            .diff_sub {background-color:darkred}
+        }"""
 
 _table_template = """
     <table class="diff" id="difflib_chg_%(prefix)s_top"

Lib/test/test_difflib_expect.html

@@ -9,13 +9,22 @@
           content="text/html; charset=utf-8" />
     <title></title>
     <style type="text/css">
+        :root {color-scheme: light dark}
         table.diff {font-family:Courier; border:medium;}
         .diff_header {background-color:#e0e0e0}
         td.diff_header {text-align:right}
         .diff_next {background-color:#c0c0c0}
-        .diff_add {background-color:#aaffaa}
+        .diff_add {background-color:palegreen}
         .diff_chg {background-color:#ffff77}
         .diff_sub {background-color:#ffaaaa}
+
+        @media (prefers-color-scheme: dark) {
+            .diff_header {background-color:#666}
+            .diff_next {background-color:#393939}
+            .diff_add {background-color:darkgreen}
+            .diff_chg {background-color:#847415}
+            .diff_sub {background-color:darkred}
+        }
     </style>
 </head>
 

Lib/test/test_sqlite3/test_userfunctions.py

@@ -171,7 +171,7 @@ def tearDown(self):
         self.con.close()
 
     def test_func_error_on_create(self):
-        with self.assertRaises(sqlite.OperationalError):
+        with self.assertRaisesRegex(sqlite.ProgrammingError, "not -100"):
             self.con.create_function("bla", -100, lambda x: 2*x)
 
     def test_func_too_many_args(self):
@@ -507,9 +507,8 @@ def test_win_sum_int(self):
         self.assertEqual(self.cur.fetchall(), self.expected)
 
     def test_win_error_on_create(self):
-        self.assertRaises(sqlite.ProgrammingError,
-                          self.con.create_window_function,
-                          "shouldfail", -100, WindowSumInt)
+        with self.assertRaisesRegex(sqlite.ProgrammingError, "not -100"):
+            self.con.create_window_function("shouldfail", -100, WindowSumInt)
 
     @with_tracebacks(BadWindow)
     def test_win_exception_in_method(self):
@@ -638,7 +637,7 @@ def tearDown(self):
         self.con.close()
 
     def test_aggr_error_on_create(self):
-        with self.assertRaises(sqlite.OperationalError):
+        with self.assertRaisesRegex(sqlite.ProgrammingError, "not -100"):
             self.con.create_function("bla", -100, AggrSum)
 
     @with_tracebacks(AttributeError, msg_regex="AggrNoStep")