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

Author: junaidkhan80121

Doc/c-api/init_config.rst

@@ -167,7 +167,7 @@ UTF-8 encoded string. See :ref:`Configuration Options <pyinitconfig-opts>`.
    Get a string list configuration option as an array of
    null-terminated UTF-8 encoded strings.
 
-   * Set *\*length* and *\*value*, and return ``0`` on success.
+   * Set *\*length* and *\*items*, and return ``0`` on success.
    * Set an error in *config* and return ``-1`` on error.
 
    On success, the string list must be released with
@@ -1948,7 +1948,7 @@ PyConfig
       If equals to zero, ignore the :ref:`environment variables
       <using-on-envvars>`.
 
-      Set to ``0`` by the :option:`-E` environment variable.
+      Set to ``0`` by the :option:`-E` command-line option.
 
       Default: ``1`` in Python config and ``0`` in isolated config.
 

Doc/c-api/interp-lifecycle.rst

@@ -575,9 +575,9 @@ Process-wide parameters
    formed from the "official" name of the operating system, converted to lower
    case, followed by the major revision number; e.g., for Solaris 2.x, which is
    also known as SunOS 5.x, the value is ``'sunos5'``.  On macOS, it is
-   ``'darwin'``.  On Windows, it is ``'win'``.  The returned string points into
-   static storage; the caller should not modify its value.  The value is available
-   to Python code as ``sys.platform``.
+   ``'darwin'``.  On Windows, it is ``'win32'``.  The returned string points
+   into static storage; the caller should not modify its value.  The value is
+   available to Python code as ``sys.platform``.
 
 
 .. c:function:: const char* Py_GetCopyright()

Doc/c-api/long.rst

@@ -596,7 +596,7 @@ distinguished from a number.  Use :c:func:`PyErr_Occurred` to disambiguate.
    Macro for converting a Python integer into a process identifier.
 
    This can be defined as an alias to :c:func:`PyLong_AsLong`,
-   :c:func:`PyLong_FromLongLong`, or :c:func:`PyLong_AsInt`, depending on the
+   :c:func:`PyLong_AsLongLong`, or :c:func:`PyLong_AsInt`, depending on the
    size of the system's PID type.
 
    .. versionadded:: 3.2

Doc/c-api/module.rst

@@ -337,7 +337,7 @@ Creation and initialization slots
 
    .. versionchanged:: 3.15
 
-      The *slots* argument may be a ``ModuleSpec``-like object, rather than
+      The *spec* argument may be a ``ModuleSpec``-like object, rather than
       a true :py:class:`~importlib.machinery.ModuleSpec` instance.
       Note that previous versions of CPython did not enforce this.
 

Doc/c-api/slots.rst

@@ -197,7 +197,7 @@ Convenience macros
          {NAME, PySlot_INTPTR, {0}, {(void*)(VALUE)}}
 
       #define PySlot_PTR_STATIC(NAME, VALUE) \
-         {NAME, PySlot_INTPTR|Py_SLOT_STATIC, {0}, {(void*)(VALUE)}}
+         {NAME, PySlot_INTPTR|PySlot_STATIC, {0}, {(void*)(VALUE)}}
 
    .. versionadded:: 3.15
 

Doc/c-api/type.rst

@@ -676,7 +676,7 @@ but need extra remarks for use as slots:
 
 .. c:macro:: Py_tp_bases
 
-   :c:member:`Slot ID <PySlot.sl_id>` for type flags, used to set
+   :c:member:`Slot ID <PySlot.sl_id>` for base types, used to set
    :c:member:`PyTypeObject.tp_bases`.
 
    The slot can be set to a tuple of type objects which the newly created
@@ -814,7 +814,7 @@ They will continue to work, but new features will be added as slots for
    :c:macro:`Py_tp_metaclass` slot.
 
    A non-``NULL`` *bases* argument corresponds to the :c:data:`Py_tp_bases`
-   slot, and takes precedence over :c:data:`Py_tp_bases` and
+   slot, and takes precedence over :c:data:`Py_tp_base` and
    :c:data:`Py_tp_bases` slots.
 
    A non-``NULL`` *module* argument corresponds to the
@@ -985,7 +985,7 @@ They will continue to work, but new features will be added as slots for
             (PySlot){
                .sl_id=tpslot.slot,
                .sl_flags=PySlot_INTPTR | sub_static,
-               .sl_ptr=tpslot.func
+               .sl_ptr=tpslot.pfunc
             }
 
          where ``sub_static`` is ``PySlot_STATIC`` if the slot requires

Doc/extending/newtypes.rst

@@ -305,8 +305,8 @@ have an associated doc string simply by providing the text in the table.  An
 application can use the introspection API to retrieve the descriptor from the
 class object, and get the doc string using its :attr:`~type.__doc__` attribute.
 
-As with the :c:member:`~PyTypeObject.tp_methods` table, a sentinel entry with a :c:member:`~PyMethodDef.ml_name` value
-of ``NULL`` is required.
+As with the :c:member:`~PyTypeObject.tp_methods` table, a sentinel entry with a
+:c:member:`~PyMemberDef.name` value of ``NULL`` is required.
 
 .. XXX Descriptors need to be explained in more detail somewhere, but not here.
 

Doc/howto/annotations.rst

@@ -243,10 +243,22 @@ If you use a class with a custom metaclass and access ``__annotations__``
 on the class, you may observe unexpected behavior; see
 :pep:`749 <749#pep749-metaclasses>` for some examples. You can avoid these
 quirks by using :func:`annotationlib.get_annotations` on Python 3.14+ or
-:func:`inspect.get_annotations` on Python 3.10+. On earlier versions of
-Python, you can avoid these bugs by accessing the annotations from the
-class's :attr:`~type.__dict__`
-(for example, ``cls.__dict__.get('__annotations__', None)``).
+:func:`inspect.get_annotations` on Python 3.10+.
+
+.. note::
+
+   On Python 3.14 and later, annotations are evaluated lazily (see
+   :pep:`649` and :pep:`749`), and how the annotations dict is stored in
+   the class's :attr:`~type.__dict__` is a private implementation detail.
+   Reading ``cls.__dict__.get('__annotations__', None)`` may therefore
+   return ``None`` even when the class has annotations. On these versions,
+   always use :func:`annotationlib.get_annotations` (or
+   :func:`inspect.get_annotations`) rather than accessing
+   :attr:`~type.__dict__` directly.
+
+Only on Python 3.9 and earlier, where neither function is available, can you
+avoid these bugs by reading the annotations from the class's
+:attr:`~type.__dict__` (for example, ``cls.__dict__.get('__annotations__', None)``).
 
 In some versions of Python, instances of classes may have an ``__annotations__``
 attribute. However, this is not supported functionality. If you need the

Doc/howto/instrumentation.rst

@@ -457,7 +457,7 @@ available:
 
 .. object:: python.function.return(str filename, str funcname, int lineno, frameptr)
 
-   This probe point is the converse of ``python.function.return``, and
+   This probe point is the converse of ``python.function.entry``, and
    indicates that execution of a Python function has ended (either via
    ``return``, or via an exception).  It is only triggered for pure-Python
    (bytecode) functions.

Doc/library/cmd.rst

@@ -110,15 +110,15 @@ A :class:`Cmd` instance has the following methods:
    undocumented commands.
 
 
-.. method:: Cmd.onecmd(str)
+.. method:: Cmd.onecmd(line)
 
    Interpret the argument as though it had been typed in response to the prompt.
    This may be overridden, but should not normally need to be; see the
    :meth:`precmd` and :meth:`postcmd` methods for useful execution hooks.  The
    return value is a flag indicating whether interpretation of commands by the
    interpreter should stop.  If there is a :meth:`!do_\*` method for the command
-   *str*, the return value of that method is returned, otherwise the return value
-   from the :meth:`default` method is returned.
+   *line*, the return value of that method is returned, otherwise the return
+   value from the :meth:`default` method is returned.
 
 
 .. method:: Cmd.emptyline()