Merge branch 'main' into csv-sniffer-counter-set

* main:
  pythongh-137288: Update 3.14 magic numbers (pythonGH-137665)
  pythongh-135228: When @DataClass(slots=True) replaces a dataclass, make the original class collectible (take 2) (pythonGH-137047)
  pythongh-126008: Improve docstrings for Tkinter cget and configure methods (pythonGH-133303)
  pythongh-131885: Use positional-only markers for ``max()`` and ``min()`` (python#131868)
  pythonGH-137426: Remove code deprecation of `importlib.abc.ResourceLoader` (pythonGH-137567)
  pythongh-125897: Mark range function parameters as positional only (python#125945)
  pythongh-137400: Fix a crash when disabling profiling across all threads (pythongh-137471)
  pythongh-115766: Fix IPv4Interface.is_unspecified (pythonGH-137326)
  pythongh-128813: cleanup C-API docs for PyComplexObject (pythonGH-137579)
  pythongh-135953: Profile a module or script with sampling profiler (python#136777)
  Fix documentation of hash in PyHash_FuncDef (python#137595)

Author: maurycy

Doc/c-api/complex.rst

@@ -3,116 +3,10 @@
 .. _complexobjects:
 
 Complex Number Objects
-----------------------
+======================
 
 .. index:: pair: object; complex number
 
-Python's complex number objects are implemented as two distinct types when
-viewed from the C API:  one is the Python object exposed to Python programs, and
-the other is a C structure which represents the actual complex number value.
-The API provides functions for working with both.
-
-
-Complex Numbers as C Structures
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Note that the functions which accept these structures as parameters and return
-them as results do so *by value* rather than dereferencing them through
-pointers.  This is consistent throughout the API.
-
-
-.. c:type:: Py_complex
-
-   The C structure which corresponds to the value portion of a Python complex
-   number object.  Most of the functions for dealing with complex number objects
-   use structures of this type as input or output values, as appropriate.
-
-   .. c:member:: double real
-                 double imag
-
-   The structure is defined as::
-
-      typedef struct {
-          double real;
-          double imag;
-      } Py_complex;
-
-
-.. c:function:: Py_complex _Py_c_sum(Py_complex left, Py_complex right)
-
-   Return the sum of two complex numbers, using the C :c:type:`Py_complex`
-   representation.
-
-   .. deprecated:: 3.15
-      This function is :term:`soft deprecated`.
-
-
-.. c:function:: Py_complex _Py_c_diff(Py_complex left, Py_complex right)
-
-   Return the difference between two complex numbers, using the C
-   :c:type:`Py_complex` representation.
-
-   .. deprecated:: 3.15
-      This function is :term:`soft deprecated`.
-
-
-.. c:function:: Py_complex _Py_c_neg(Py_complex num)
-
-   Return the negation of the complex number *num*, using the C
-   :c:type:`Py_complex` representation.
-
-   .. deprecated:: 3.15
-      This function is :term:`soft deprecated`.
-
-
-.. c:function:: Py_complex _Py_c_prod(Py_complex left, Py_complex right)
-
-   Return the product of two complex numbers, using the C :c:type:`Py_complex`
-   representation.
-
-   .. deprecated:: 3.15
-      This function is :term:`soft deprecated`.
-
-
-.. c:function:: Py_complex _Py_c_quot(Py_complex dividend, Py_complex divisor)
-
-   Return the quotient of two complex numbers, using the C :c:type:`Py_complex`
-   representation.
-
-   If *divisor* is null, this method returns zero and sets
-   :c:data:`errno` to :c:macro:`!EDOM`.
-
-   .. deprecated:: 3.15
-      This function is :term:`soft deprecated`.
-
-
-.. c:function:: Py_complex _Py_c_pow(Py_complex num, Py_complex exp)
-
-   Return the exponentiation of *num* by *exp*, using the C :c:type:`Py_complex`
-   representation.
-
-   If *num* is null and *exp* is not a positive real number,
-   this method returns zero and sets :c:data:`errno` to :c:macro:`!EDOM`.
-
-   Set :c:data:`errno` to :c:macro:`!ERANGE` on overflows.
-
-   .. deprecated:: 3.15
-      This function is :term:`soft deprecated`.
-
-
-.. c:function:: double _Py_c_abs(Py_complex num)
-
-   Return the absolute value of the complex number *num*.
-
-   Set :c:data:`errno` to :c:macro:`!ERANGE` on overflows.
-
-   .. deprecated:: 3.15
-      This function is :term:`soft deprecated`.
-
-
-Complex Numbers as Python Objects
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
 
 .. c:type:: PyComplexObject
 
@@ -147,12 +41,6 @@ Complex Numbers as Python Objects
    :c:type:`PyComplexObject`.  This function always succeeds.
 
 
-.. c:function:: PyObject* PyComplex_FromCComplex(Py_complex v)
-
-   Create a new Python complex number object from a C :c:type:`Py_complex` value.
-   Return ``NULL`` with an exception set on error.
-
-
 .. c:function:: PyObject* PyComplex_FromDoubles(double real, double imag)
 
    Return a new :c:type:`PyComplexObject` object from *real* and *imag*.
@@ -191,6 +79,29 @@ Complex Numbers as Python Objects
    .. versionchanged:: 3.13
       Use :meth:`~object.__complex__` if available.
 
+
+.. c:type:: Py_complex
+
+   This C structure defines export format for a Python complex
+   number object.
+
+   .. c:member:: double real
+                 double imag
+
+   The structure is defined as::
+
+      typedef struct {
+          double real;
+          double imag;
+      } Py_complex;
+
+
+.. c:function:: PyObject* PyComplex_FromCComplex(Py_complex v)
+
+   Create a new Python complex number object from a C :c:type:`Py_complex` value.
+   Return ``NULL`` with an exception set on error.
+
+
 .. c:function:: Py_complex PyComplex_AsCComplex(PyObject *op)
 
    Return the :c:type:`Py_complex` value of the complex number *op*.
@@ -207,3 +118,82 @@ Complex Numbers as Python Objects
 
    .. versionchanged:: 3.8
       Use :meth:`~object.__index__` if available.
+
+
+Complex Numbers as C Structures
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The API also provides functions for working with complex numbers, using the
+:c:type:`Py_complex` representation.  Note that the functions which accept
+these structures as parameters and return them as results do so *by value*
+rather than dereferencing them through pointers.
+
+Please note, that these functions are :term:`soft deprecated` since Python
+3.15.  Avoid using this API in a new code to do complex arithmetic: either use
+the `Number Protocol <number>`_ API or use native complex types, like
+:c:expr:`double complex`.
+
+
+.. c:function:: Py_complex _Py_c_sum(Py_complex left, Py_complex right)
+
+   Return the sum of two complex numbers, using the C :c:type:`Py_complex`
+   representation.
+
+   .. deprecated:: 3.15
+
+
+.. c:function:: Py_complex _Py_c_diff(Py_complex left, Py_complex right)
+
+   Return the difference between two complex numbers, using the C
+   :c:type:`Py_complex` representation.
+
+   .. deprecated:: 3.15
+
+
+.. c:function:: Py_complex _Py_c_neg(Py_complex num)
+
+   Return the negation of the complex number *num*, using the C
+   :c:type:`Py_complex` representation.
+
+   .. deprecated:: 3.15
+
+
+.. c:function:: Py_complex _Py_c_prod(Py_complex left, Py_complex right)
+
+   Return the product of two complex numbers, using the C :c:type:`Py_complex`
+   representation.
+
+   .. deprecated:: 3.15
+
+
+.. c:function:: Py_complex _Py_c_quot(Py_complex dividend, Py_complex divisor)
+
+   Return the quotient of two complex numbers, using the C :c:type:`Py_complex`
+   representation.
+
+   If *divisor* is null, this method returns zero and sets
+   :c:data:`errno` to :c:macro:`!EDOM`.
+
+   .. deprecated:: 3.15
+
+
+.. c:function:: Py_complex _Py_c_pow(Py_complex num, Py_complex exp)
+
+   Return the exponentiation of *num* by *exp*, using the C :c:type:`Py_complex`
+   representation.
+
+   If *num* is null and *exp* is not a positive real number,
+   this method returns zero and sets :c:data:`errno` to :c:macro:`!EDOM`.
+
+   Set :c:data:`errno` to :c:macro:`!ERANGE` on overflows.
+
+   .. deprecated:: 3.15
+
+
+.. c:function:: double _Py_c_abs(Py_complex num)
+
+   Return the absolute value of the complex number *num*.
+
+   Set :c:data:`errno` to :c:macro:`!ERANGE` on overflows.
+
+   .. deprecated:: 3.15

Doc/c-api/hash.rst

@@ -51,7 +51,7 @@ See also the :c:member:`PyTypeObject.tp_hash` member and :ref:`numeric-hash`.
 
    Hash function definition used by :c:func:`PyHash_GetFuncDef`.
 
-   .. c::member:: Py_hash_t (*const hash)(const void *, Py_ssize_t)
+   .. c:member:: Py_hash_t (*const hash)(const void *, Py_ssize_t)
 
       Hash function.
 

Doc/library/functions.rst

@@ -1220,9 +1220,9 @@ are always available.  They are listed here in alphabetical order.
       Added the *strict* parameter.
 
 
-.. function:: max(iterable, *, key=None)
-              max(iterable, *, default, key=None)
-              max(arg1, arg2, *args, key=None)
+.. function:: max(iterable, /, *, key=None)
+              max(iterable, /, *, default, key=None)
+              max(arg1, arg2, /, *args, key=None)
 
    Return the largest item in an iterable or the largest of two or more
    arguments.
@@ -1258,9 +1258,9 @@ are always available.  They are listed here in alphabetical order.
    :ref:`typememoryview` for more information.
 
 
-.. function:: min(iterable, *, key=None)
-              min(iterable, *, default, key=None)
-              min(arg1, arg2, *args, key=None)
+.. function:: min(iterable, /, *, key=None)
+              min(iterable, /, *, default, key=None)
+              min(arg1, arg2, /, *args, key=None)
 
    Return the smallest item in an iterable or the smallest of two or more
    arguments.
@@ -1729,8 +1729,8 @@ are always available.  They are listed here in alphabetical order.
 
 
 .. _func-range:
-.. class:: range(stop)
-           range(start, stop, step=1)
+.. class:: range(stop, /)
+           range(start, stop, step=1, /)
    :noindex:
 
    Rather than being a function, :class:`range` is actually an immutable

Doc/library/importlib.rst

@@ -393,6 +393,8 @@ ABC hierarchy::
     .. deprecated:: 3.7
        This ABC is deprecated in favour of supporting resource loading
        through :class:`importlib.resources.abc.TraversableResources`.
+       This class exists for backwards compatibility only with other ABCs in
+       this module.
 
     .. method:: get_data(path)
        :abstractmethod:

Include/internal/pycore_magic_number.h

@@ -277,6 +277,8 @@ Known values:
     Python 3.14a7 3622 (Store annotations in different class dict keys)
     Python 3.14a7 3623 (Add BUILD_INTERPOLATION & BUILD_TEMPLATE opcodes)
     Python 3.14b1 3624 (Don't optimize LOAD_FAST when local is killed by DELETE_FAST)
+    Python 3.14b3 3625 (Fix handling of opcodes that may leave operands on the stack when optimizing LOAD_FAST)
+    Python 3.14rc2 3626 (Fix missing exception handlers in logical expression)
     Python 3.15a0 3650 (Initial version)
     Python 3.15a1 3651 (Simplify LOAD_CONST)
     Python 3.15a1 3652 (Virtual iterators)

Lib/dataclasses.py

@@ -1283,6 +1283,10 @@ def _add_slots(cls, is_frozen, weakref_slot, defined_fields):
     if '__slots__' in cls.__dict__:
         raise TypeError(f'{cls.__name__} already specifies __slots__')
 
+    # gh-102069: Remove existing __weakref__ descriptor.
+    # gh-135228: Make sure the original class can be garbage collected.
+    sys._clear_type_descriptors(cls)
+
     # Create a new dict for our new class.
     cls_dict = dict(cls.__dict__)
     field_names = tuple(f.name for f in fields(cls))
@@ -1300,12 +1304,6 @@ def _add_slots(cls, is_frozen, weakref_slot, defined_fields):
         #  available in _MARKER.
         cls_dict.pop(field_name, None)
 
-    # Remove __dict__ itself.
-    cls_dict.pop('__dict__', None)
-
-    # Clear existing `__weakref__` descriptor, it belongs to a previous type:
-    cls_dict.pop('__weakref__', None)  # gh-102069
-
     # And finally create the class.
     qualname = getattr(cls, '__qualname__', None)
     newcls = type(cls)(cls.__name__, cls.__bases__, cls_dict)

Lib/importlib/abc.py

@@ -64,20 +64,14 @@ def invalidate_caches(self):
 class ResourceLoader(Loader):
 
     """Abstract base class for loaders which can return data from their
-    back-end storage.
+    back-end storage to facilitate reading data to perform an import.
 
     This ABC represents one of the optional protocols specified by PEP 302.
 
-    """
-
-    def __init__(self):
-        import warnings
-        warnings.warn('importlib.abc.ResourceLoader is deprecated in '
-                      'favour of supporting resource loading through '
-                      'importlib.resources.abc.TraversableResources.',
-                      DeprecationWarning, stacklevel=2)
-        super().__init__()
+    For directly loading resources, use TraversableResources instead. This class
+    primarily exists for backwards compatibility with other ABCs in this module.
 
+    """
 
     @abc.abstractmethod
     def get_data(self, path):

Lib/ipaddress.py

@@ -1479,6 +1479,10 @@ def with_hostmask(self):
         return '%s/%s' % (self._string_from_ip_int(self._ip),
                           self.hostmask)
 
+    @property
+    def is_unspecified(self):
+        return self._ip == 0 and self.network.is_unspecified
+
 
 class IPv4Network(_BaseV4, _BaseNetwork):