[3.14] Use `soft-deprecated` in more places (GH-148769) (#152938)

(cherry picked from commit 3fd61b74de97b152ed424aaea1295292dcb181fd)

diff --git a/Doc/c-api/buffer.rst b/Doc/c-api/buffer.rst
index 6bb72a2312be3bbaefc2b56615c3c3e462791a5f..22f54cfee81a99cb228abc0b61606a794820ca39 100644 (file)
--- a/Doc/c-api/buffer.rst
+++ b/Doc/c-api/buffer.rst
@@ -263,7 +263,9 @@ readonly, format
 
    .. c:macro:: PyBUF_WRITEABLE
 
-      This is a :term:`soft deprecated` alias to :c:macro:`PyBUF_WRITABLE`.
+      This is an alias to :c:macro:`PyBUF_WRITABLE`.
+
+      .. soft-deprecated:: 3.13
 
    .. c:macro:: PyBUF_FORMAT
 

diff --git a/Doc/c-api/code.rst b/Doc/c-api/code.rst
index 048bc2c2154e77627eb840c75adcb6e53a3852cf..3ffbd9dc170939167e0a68269f57e6b0e8495a79 100644 (file)
--- a/Doc/c-api/code.rst
+++ b/Doc/c-api/code.rst
@@ -214,7 +214,7 @@ bound into a function.
 
 .. c:function:: PyObject *PyCode_Optimize(PyObject *code, PyObject *consts, PyObject *names, PyObject *lnotab_obj)
 
-   This is a :term:`soft deprecated` function that does nothing.
+   This is a function that does nothing.
 
    Prior to Python 3.10, this function would perform basic optimizations to a
    code object.
@@ -222,6 +222,8 @@ bound into a function.
    .. versionchanged:: 3.10
       This function now does nothing.
 
+   .. soft-deprecated:: 3.13
+
 
 .. _c_codeobject_flags:
 

diff --git a/Doc/c-api/gen.rst b/Doc/c-api/gen.rst
index 3d51e7dacc33849759174da4316b550a2f4bf503..8648d529170c82bf64da369e27d5efe3db42512e 100644 (file)
--- a/Doc/c-api/gen.rst
+++ b/Doc/c-api/gen.rst
@@ -91,7 +91,9 @@ Deprecated API
 
 .. c:macro:: PyAsyncGenASend_CheckExact(op)
 
-   This is a :term:`soft deprecated` API that was included in Python's C API
+   This is an API that was included in Python's C API
    by mistake.
 
    It is solely here for completeness; do not use this API.
+
+   .. soft-deprecated:: 3.14

diff --git a/Doc/c-api/intro.rst b/Doc/c-api/intro.rst
index f39b253a7cfe6bb186987b50cb6bb8aaf2b21c41..94abb9fdb50ac2df02415a57503c176efc7e5a08 100644 (file)
--- a/Doc/c-api/intro.rst
+++ b/Doc/c-api/intro.rst
@@ -508,22 +508,22 @@ in C11.
 
 .. c:macro:: Py_MEMCPY(dest, src, n)
 
-   This is a :term:`soft deprecated` alias to :c:func:`!memcpy`.
-   Use :c:func:`!memcpy` directly instead.
+   This is an alias to :c:func:`!memcpy`.
 
-   .. deprecated:: 3.14
-      The macro is :term:`soft deprecated`.
+   .. soft-deprecated:: 3.14
+      Use :c:func:`!memcpy` directly instead.
 
 .. c:macro:: Py_VA_COPY
 
-   This is a :term:`soft deprecated` alias to the C99-standard ``va_copy``
-   function.
+   This is an alias to the C99-standard ``va_copy`` function.
 
    Historically, this would use a compiler-specific method to copy a ``va_list``.
 
    .. versionchanged:: 3.6
       This is now an alias to ``va_copy``.
 
+   .. soft-deprecated:: 3.14
+
 
 .. _api-objects:
 

diff --git a/Doc/c-api/set.rst b/Doc/c-api/set.rst
index c81087697b498db839b18680ccc29c6b4d715b07..a44d49ecd1857ec88d764401b60e3cf3420bb36c 100644 (file)
--- a/Doc/c-api/set.rst
+++ b/Doc/c-api/set.rst
@@ -204,7 +204,7 @@ Deprecated API
 
 .. c:macro:: PySet_MINSIZE
 
-   A :term:`soft deprecated` constant representing the size of an internal
+   A constant representing the size of an internal
    preallocated table inside :c:type:`PySetObject` instances.
 
    This is documented solely for completeness, as there are no guarantees
@@ -214,3 +214,5 @@ Deprecated API
    :c:macro:`!PySet_MINSIZE` can be replaced with a small constant like ``8``.
 
    If looking for the size of a set, use :c:func:`PySet_Size` instead.
+
+   .. soft-deprecated:: 3.14

diff --git a/Doc/c-api/typeobj.rst b/Doc/c-api/typeobj.rst
index 72335a6181eac28c5d71729599bd1490f61a5463..29204991faae95b7d14f07466d1b9343a068788c 100644 (file)
--- a/Doc/c-api/typeobj.rst
+++ b/Doc/c-api/typeobj.rst
@@ -1376,8 +1376,8 @@ and :c:data:`PyType_Type` effectively act as defaults.)
 
       .. versionchanged:: 3.9
 
-      Renamed to the current name, without the leading underscore.
-      The old provisional name is :term:`soft deprecated`.
+         Renamed to the current name, without the leading underscore.
+         The old provisional name is :term:`soft deprecated`.
 
       .. versionchanged:: 3.12
 
@@ -1486,11 +1486,13 @@ and :c:data:`PyType_Type` effectively act as defaults.)
 
    .. c:macro:: Py_TPFLAGS_HAVE_VERSION_TAG
 
-      This is a :term:`soft deprecated` macro that does nothing.
+      This macro does nothing.
       Historically, this would indicate that the
       :c:member:`~PyTypeObject.tp_version_tag` field was available and
       initialized.
 
+      .. soft-deprecated:: 3.13
+
 
    .. c:macro:: Py_TPFLAGS_INLINE_VALUES
 

diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst
index eb6f48e0dcc590a82b21a0908a34a426164f6d63..25b27743f6996cf9583d268696602e53f1c55749 100644 (file)
--- a/Doc/library/ctypes.rst
+++ b/Doc/library/ctypes.rst
@@ -3191,8 +3191,8 @@ Arrays and pointers
    Equivalent to ``type * length``, where *type* is a
    :mod:`!ctypes` data type and *length* an integer.
 
-   This function is :term:`soft deprecated` in favor of multiplication.
-   There are no plans to remove it.
+   .. soft-deprecated:: 3.14
+      In favor of multiplication.
 
 
 .. class:: _Pointer

diff --git a/Doc/library/mimetypes.rst b/Doc/library/mimetypes.rst
index 05b52052fbc0f4fbd8381ba47efb2191c5137330..c9cf3d3e8d30b2f7f74067da7c204b0f78bc5abe 100644 (file)
--- a/Doc/library/mimetypes.rst
+++ b/Doc/library/mimetypes.rst
@@ -57,7 +57,7 @@ the information :func:`init` sets up.
       Added support for *url* being a :term:`path-like object`.
 
    .. soft-deprecated:: 3.13
-      Passing a file path instead of URL is :term:`soft deprecated`.
+      Passing a file path instead of URL.
       Use :func:`guess_file_type` for this.