Merge branch 'main' into gh-159689-processpool-mid-send

Author: junaidkhan80121

.gitignore

@@ -102,6 +102,7 @@ Modules/Setup.config
 Modules/Setup.local
 Modules/Setup.stdlib
 Modules/config.c
+Modules/config_bootstrap.c
 Modules/ld_so_aix
 Programs/_freeze_module
 Programs/_testembed

Doc/c-api/bytes.rst

@@ -494,7 +494,7 @@ Variant using a pointer to compute the final size::
 
         char *str = PyBytesWriter_GetData(writer);
         memcpy(str, "abc", 3);
-        str += 1;
+        str += 3;
         return PyBytesWriter_FinishWithPointer(writer, str);
     }
 
@@ -543,7 +543,7 @@ Update ``_PyBytes_Resize()`` code
 
 Example of code using the soft deprecated ``_PyBytes_Resize()`` API::
 
-    void create_string(Py_ssize_t size)
+    PyObject* create_string(Py_ssize_t size)
     {
         PyObject *bytes = PyBytes_FromStringAndSize(NULL, size);
         if (bytes == NULL) {
@@ -561,7 +561,7 @@ Example of code using the soft deprecated ``_PyBytes_Resize()`` API::
 
 It can now be updated to::
 
-    void create_string(Py_ssize_t size)
+    PyObject* create_string(Py_ssize_t size)
     {
         PyBytesWriter *writer = PyBytesWriter_Create(size);
         if (writer == NULL) {

Doc/c-api/call.rst

@@ -81,17 +81,17 @@ This is a pointer to a function with the following signature:
 
 - *callable* is the object being called.
 - *args* is a C array consisting of the positional arguments followed by the
-   values of the keyword arguments.
-   This can be *NULL* if there are no arguments.
+  values of the keyword arguments.
+  This can be *NULL* if there are no arguments.
 - *nargsf* is the number of positional arguments plus possibly the
-   :c:macro:`PY_VECTORCALL_ARGUMENTS_OFFSET` flag.
-   To get the actual number of positional arguments from *nargsf*,
-   use :c:func:`PyVectorcall_NARGS`.
+  :c:macro:`PY_VECTORCALL_ARGUMENTS_OFFSET` flag.
+  To get the actual number of positional arguments from *nargsf*,
+  use :c:func:`PyVectorcall_NARGS`.
 - *kwnames* is a tuple containing the names of the keyword arguments;
-   in other words, the keys of the kwargs dict.
-   These names must be strings (instances of ``str`` or a subclass)
-   and they must be unique.
-   If there are no keyword arguments, then *kwnames* can instead be *NULL*.
+  in other words, the keys of the kwargs dict.
+  These names must be strings (instances of ``str`` or a subclass)
+  and they must be unique.
+  If there are no keyword arguments, then *kwnames* can instead be *NULL*.
 
 .. c:macro:: PY_VECTORCALL_ARGUMENTS_OFFSET
 

Doc/c-api/datetime.rst

@@ -13,7 +13,7 @@ the module initialisation function.  The macro puts a pointer to a C structure
 into a static variable, :c:data:`PyDateTimeAPI`, that is used by the following
 macros.
 
-.. c:macro:: PyDateTime_IMPORT()
+.. c:macro:: PyDateTime_IMPORT
 
    Import the datetime C API.
 
@@ -51,7 +51,7 @@ macros.
    .. versionchanged:: 3.15
 
       This variable should not be accessed directly as direct access is not thread-safe.
-      Use :c:func:`PyDateTime_IMPORT` instead.
+      Use :c:macro:`PyDateTime_IMPORT` instead.
 
 .. c:type:: PyDateTime_Date
 

Doc/c-api/function.rst

@@ -193,7 +193,7 @@ There are a few functions specific to Python functions.
 
    .. versionadded:: 3.12
 
-    - ``PyFunction_PYFUNC_EVENT_MODIFY_QUALNAME``
+    - ``PyFunction_EVENT_MODIFY_QUALNAME``
 
    .. versionadded:: 3.15
 

Doc/c-api/init_config.rst

@@ -840,7 +840,7 @@ Example::
         if (PyStatus_Exception(status)) {
             Py_ExitStatusException(status);
         }
-        PyMem_Free(ptr);
+        PyMem_RawFree(ptr);
         return 0;
     }
 

Doc/conf.py

@@ -319,7 +319,7 @@
     print("It may be removed in the future\n")
 
 # Short title used e.g. for <title> HTML tags.
-html_short_title = f'{release} Documentation'
+html_short_title = f'{release} documentation'
 
 # Deployment preview information
 # (See .readthedocs.yml and https://docs.readthedocs.io/en/stable/reference/environment-variables.html)

Doc/deprecations/c-api-pending-removal-in-3.18.rst

@@ -31,11 +31,13 @@ Pending removal in Python 3.18
     replace ``_PyUnicodeWriter_WriteSubstring(&writer, str, start, end)`` with
     :c:func:`PyUnicodeWriter_WriteSubstring(writer, str, start, end) <PyUnicodeWriter_WriteSubstring>`.
   * :c:func:`!_PyUnicodeWriter_WriteASCIIString`:
-    replace ``_PyUnicodeWriter_WriteASCIIString(&writer, str)`` with
-    :c:func:`PyUnicodeWriter_WriteASCII(writer, str) <PyUnicodeWriter_WriteASCII>`.
+    replace ``_PyUnicodeWriter_WriteASCIIString(&writer, str, size)`` with
+    :c:func:`PyUnicodeWriter_WriteASCII(writer, str, size) <PyUnicodeWriter_WriteASCII>`.
   * :c:func:`!_PyUnicodeWriter_WriteLatin1String`:
-    replace ``_PyUnicodeWriter_WriteLatin1String(&writer, str)`` with
-    :c:func:`PyUnicodeWriter_WriteUTF8(writer, str) <PyUnicodeWriter_WriteUTF8>`.
+    replace ``_PyUnicodeWriter_WriteLatin1String(&writer, str, size)`` by
+    decoding the string with :c:func:`PyUnicode_DecodeLatin1`, writing the
+    result with :c:func:`PyUnicodeWriter_WriteStr`, and releasing the result
+    with :c:func:`Py_DECREF`.
   * :c:func:`!_PyUnicodeWriter_Prepare`: (no replacement).
   * :c:func:`!_PyUnicodeWriter_PrepareKind`: (no replacement).
   * :c:func:`!_Py_HashPointer`: use :c:func:`Py_HashPointer`.

Doc/howto/functional.rst

@@ -628,7 +628,7 @@ Two of Python's built-in functions, :func:`map` and :func:`filter` duplicate the
 features of generator expressions:
 
 :func:`map(f, iterA, iterB, ...) <map>` returns an iterator over the sequence
- ``f(iterA[0], iterB[0]), f(iterA[1], iterB[1]), f(iterA[2], iterB[2]), ...``.
+``f(iterA[0], iterB[0]), f(iterA[1], iterB[1]), f(iterA[2], iterB[2]), ...``.
 
     >>> def upper(s):
     ...     return s.upper()

Doc/howto/mro.rst

@@ -348,7 +348,7 @@ straightforward to compute the linearizations of O, X, Y, A and B:
 
  .. code-block:: text
 
-  L[O] = 0
+  L[O] = O
   L[X] = X O
   L[Y] = Y O
   L[A] = A X Y O