Merge branch 'main' into unignore-error-port-unreachable-in-proactor

Author: graingert

Doc/builtins/stdtypes.rst

@@ -2157,7 +2157,7 @@ expression support in the :mod:`re` module).
 
    The casefolding algorithm is `described in section 3.13.3 'Default Case
    Folding' of the Unicode Standard
-   <https://www.unicode.org/versions/Unicode17.0.0/core-spec/chapter-3/#G53253>`__.
+   <https://www.unicode.org/versions/Unicode18.0.0/core-spec/chapter-3/#G53253>`__.
 
    .. versionadded:: 3.3
 
@@ -2398,7 +2398,7 @@ expression support in the :mod:`re` module).
    property being one of "Lm", "Lt", "Lu", "Ll", or "Lo".  Note that this is different
    from the `Alphabetic property defined in section 4.10 'Letters, Alphabetic, and
    Ideographic' of the Unicode Standard
-   <https://www.unicode.org/versions/Unicode17.0.0/core-spec/chapter-4/#G91002>`__.
+   <https://www.unicode.org/versions/Unicode18.0.0/core-spec/chapter-4/#G91002>`__.
    For example:
 
    .. doctest::
@@ -2664,7 +2664,7 @@ expression support in the :mod:`re` module).
 
    The lowercasing algorithm used is `described in section 3.13.2 'Default Case
    Conversion' of the Unicode Standard
-   <https://www.unicode.org/versions/Unicode17.0.0/core-spec/chapter-3/#G34078>`__.
+   <https://www.unicode.org/versions/Unicode18.0.0/core-spec/chapter-3/#G34078>`__.
 
 
 .. method:: str.lstrip(chars=None, /)
@@ -3176,7 +3176,7 @@ expression support in the :mod:`re` module).
 
    The uppercasing algorithm used is `described in section 3.13.2 'Default Case
    Conversion' of the Unicode Standard
-   <https://www.unicode.org/versions/Unicode17.0.0/core-spec/chapter-3/#G34078>`__.
+   <https://www.unicode.org/versions/Unicode18.0.0/core-spec/chapter-3/#G34078>`__.
 
 
 .. method:: str.zfill(width, /)

Doc/c-api/bytes.rst

@@ -249,7 +249,7 @@ called with a non-bytes parameter.
 
    While bytes objects are usually immutable in Python, this special C API
    allows mutating a bytes object in-place. The returned bytes object can still
-   be mutated using :c:func:`PyBytesWriter_GetData`; except if *newsize* is
+   be mutated using :c:func:`PyBytes_AsString`; except if *newsize* is
    zero in which case it returns the immutable empty bytes string.
 
    .. soft-deprecated:: 3.15
@@ -305,8 +305,8 @@ object.
 
    A bytes writer object.
 
-   The API is **not thread safe**. A :c:type:`PyBytesWriter` object must only
-   be used by a single thread, it must not be shared between threads.
+   The API is **not thread safe**. To share a writer with multiple threads, a
+   critical section or a lock is needed.
 
    The instance must be destroyed by :c:func:`PyBytesWriter_Finish` on
    success, or :c:func:`PyBytesWriter_Discard` on error.

Doc/c-api/unicode.rst

@@ -1797,6 +1797,9 @@ object.
    The instance must be destroyed by :c:func:`PyUnicodeWriter_Finish` on
    success, or :c:func:`PyUnicodeWriter_Discard` on error.
 
+   The API is **not thread safe**. To share a writer with multiple threads, a
+   critical section or a lock is needed.
+
 .. c:function:: PyUnicodeWriter* PyUnicodeWriter_Create(Py_ssize_t length)
 
    Create a Unicode writer instance.

Doc/library/importlib.rst

@@ -355,11 +355,11 @@ ABC hierarchy::
     See :pep:`302` for the exact definition for a loader.
 
     Loaders that wish to support resource reading should implement a
-    :meth:`get_resource_reader` method as specified by
+    :meth:`!get_resource_reader` method as specified by
     :class:`importlib.resources.abc.ResourceReader`.
 
     .. versionchanged:: 3.7
-       Introduced the optional :meth:`get_resource_reader` method.
+       Introduced the optional :meth:`!get_resource_reader` method.
 
    .. versionchanged:: 3.15
       Removed the ``load_module()`` method.
@@ -717,7 +717,8 @@ find and load modules.
 
     .. versionchanged:: 3.5
        As part of :pep:`489`, the builtin importer now implements
-       :meth:`Loader.create_module` and :meth:`Loader.exec_module`
+       :meth:`Loader.create_module <importlib.abc.Loader.create_module>`
+       and :meth:`Loader.exec_module <importlib.abc.Loader.exec_module>`
 
 
 .. class:: FrozenImporter
@@ -730,7 +731,8 @@ find and load modules.
     instantiation.
 
     .. versionchanged:: 3.4
-       Gained :meth:`~Loader.create_module` and :meth:`~Loader.exec_module`
+       Gained :meth:`~importlib.abc.Loader.create_module` and
+       :meth:`~importlib.abc.Loader.exec_module`
        methods.
 
 
@@ -1180,8 +1182,8 @@ an :term:`importer`.
    with the source *path*.  For example, if *path* is ``/foo/bar/baz.py`` the return
    value would be ``/foo/bar/__pycache__/baz.cpython-32.pyc`` for Python 3.2.
    The ``cpython-32`` string comes from the current magic tag (see
-   :func:`get_tag`; if :attr:`sys.implementation.cache_tag` is not defined then
-   :exc:`NotImplementedError` will be raised).
+   :attr:`sys.implementation.cache_tag <sys.implementation>`; if it is not
+   defined then :exc:`NotImplementedError` will be raised).
 
    The *optimization* parameter is used to specify the optimization level of the
    bytecode file. An empty string represents no optimization, so
@@ -1213,7 +1215,7 @@ an :term:`importer`.
    ``/foo/bar/__pycache__/baz.cpython-32.pyc`` the returned path would be
    ``/foo/bar/baz.py``.  *path* need not exist, however if it does not conform
    to :pep:`3147` or :pep:`488` format, a :exc:`ValueError` is raised. If
-   :attr:`sys.implementation.cache_tag` is not defined,
+   :attr:`sys.implementation.cache_tag <sys.implementation>` is not defined,
    :exc:`NotImplementedError` is raised.
 
    .. versionadded:: 3.4
@@ -1263,7 +1265,8 @@ an :term:`importer`.
    If **name** is for a submodule (contains a dot), the parent module is
    automatically imported.
 
-   **name** and **package** work the same as for :func:`import_module`.
+   **name** and **package** work the same as for
+   :func:`importlib.import_module`.
 
    .. versionadded:: 3.4
 
@@ -1293,7 +1296,8 @@ an :term:`importer`.
    A factory function for creating a :class:`~importlib.machinery.ModuleSpec`
    instance based on a loader.  The parameters have the same meaning as they do
    for ModuleSpec.  The function uses available :term:`loader` APIs, such as
-   :meth:`InspectLoader.is_package`, to fill in any missing
+   :meth:`InspectLoader.is_package
+   <importlib.abc.InspectLoader.is_package>`, to fill in any missing
    information on the spec.
 
    .. versionadded:: 3.4

Doc/library/re.rst

@@ -614,7 +614,7 @@ character ``'$'``.
 
       Matches ``[0-9]`` if the :py:const:`~re.ASCII` flag is used.
 
-      __ https://www.unicode.org/versions/Unicode17.0.0/core-spec/chapter-4/#G124142
+      __ https://www.unicode.org/versions/Unicode18.0.0/core-spec/chapter-4/#G124142
 
    For 8-bit (bytes) patterns:
       Matches any decimal digit in the ASCII character set;

Doc/library/unicodedata.rst

@@ -13,8 +13,8 @@
 
 This module provides access to the Unicode Character Database (UCD) which
 defines character properties for all Unicode characters. The data contained in
-this database is compiled from the `UCD version 17.0.0
-<https://www.unicode.org/Public/17.0.0/ucd>`_.
+this database is compiled from the `UCD version 18.0.0
+<https://www.unicode.org/Public/18.0.0/ucd>`_.
 
 The module uses the same names and symbols as defined by Unicode
 Standard Annex #44, `"Unicode Character Database"
@@ -170,7 +170,7 @@ Standard Annex #44, `"Unicode Character Database"
 .. function:: block(chr, /)
 
    Returns the `block
-   <https://www.unicode.org/versions/Unicode17.0.0/core-spec/chapter-3/#G64189>`_
+   <https://www.unicode.org/versions/Unicode18.0.0/core-spec/chapter-3/#G64189>`_
    assigned to the character *chr*. For example::
 
       >>> unicodedata.block('S')
@@ -326,6 +326,6 @@ In addition, the module exposes the following constants:
 
 .. rubric:: Footnotes
 
-.. [#] https://www.unicode.org/Public/17.0.0/ucd/NameAliases.txt
+.. [#] https://www.unicode.org/Public/18.0.0/ucd/NameAliases.txt
 
-.. [#] https://www.unicode.org/Public/17.0.0/ucd/NamedSequences.txt
+.. [#] https://www.unicode.org/Public/18.0.0/ucd/NamedSequences.txt

Doc/reference/lexical_analysis.rst

@@ -602,8 +602,8 @@ Unicode categories use the version of the Unicode Character Database as
 included in the :mod:`unicodedata` module.
 
 .. _UAX-31: https://www.unicode.org/reports/tr31/
-.. _PropList.txt: https://www.unicode.org/Public/17.0.0/ucd/PropList.txt
-.. _DerivedCoreProperties.txt: https://www.unicode.org/Public/17.0.0/ucd/DerivedCoreProperties.txt
+.. _PropList.txt: https://www.unicode.org/Public/18.0.0/ucd/PropList.txt
+.. _DerivedCoreProperties.txt: https://www.unicode.org/Public/18.0.0/ucd/DerivedCoreProperties.txt
 .. _normalization form: https://www.unicode.org/reports/tr15/#Norm_Forms
 
 .. seealso::
@@ -916,7 +916,7 @@ with the given *name*::
 This sequence cannot appear in :ref:`bytes literals <bytes-literal>`.
 
 .. versionchanged:: 3.3
-   Support for `name aliases <https://www.unicode.org/Public/17.0.0/ucd/NameAliases.txt>`__
+   Support for `name aliases <https://www.unicode.org/Public/18.0.0/ucd/NameAliases.txt>`__
    has been added.
 
 .. _string-escape-long-hex:

Doc/tools/.nitignore

@@ -6,7 +6,6 @@ Doc/library/ast.rst
 Doc/library/asyncio-extending.rst
 Doc/library/email.charset.rst
 Doc/library/email.parser.rst
-Doc/library/importlib.rst
 Doc/library/logging.config.rst
 Doc/library/logging.handlers.rst
 Doc/library/mmap.rst

Doc/whatsnew/3.16.rst

@@ -695,6 +695,11 @@ tkinter
   with no unit suffix to :class:`int` or :class:`float`.
   (Contributed by Serhiy Storchaka in :gh:`153513`.)
 
+unicodedata
+-----------
+
+* The Unicode database has been updated to Unicode 18.0.0.
+
 xml
 ---
 

Grammar/python.gram

@@ -1181,8 +1181,12 @@ invalid_arguments:
         RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, _PyPegen_get_last_comprehension_item(PyPegen_last_item(b, comprehension_ty)), "Generator expression must be parenthesized") }
     | a=args ',' args { _PyPegen_arguments_parsing_error(p, a) }
 invalid_kwarg:
-    | a[Token*]=('True'|'False'|'None') b='=' {
-        RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "cannot assign to %s", PyBytes_AS_STRING(a->bytes)) }
+    | a='True' b='=' {
+        RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "cannot assign to True") }
+    | a='False' b='=' {
+        RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "cannot assign to False") }
+    | a='None' b='=' {
+        RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "cannot assign to None") }
     | a=NAME b='=' expression for_if_clauses {
         RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "invalid syntax. Maybe you meant '==' or ':=' instead of '='?")}
     | !(NAME '=') a=expression b='=' {