Merge branch 'main' into deprecations

Author: StanFromIreland

Doc/deprecations/pending-removal-in-3.16.rst

@@ -91,7 +91,7 @@ Pending removal in Python 3.16
 
 * :mod:`symtable`:
 
-  * The :meth:`Class.get_methods <symtable.Class.get_methods>` method
+  * The :meth:`!symtable.Class.get_methods` method
     has been deprecated since Python 3.14.
 
 * :mod:`sys`:

Doc/library/symtable.rst

@@ -187,57 +187,6 @@ Examining Symbol Tables
 
    A namespace of a class.  This class inherits from :class:`SymbolTable`.
 
-   .. method:: get_methods()
-
-      Return a tuple containing the names of method-like functions declared
-      in the class.
-
-      Here, the term 'method' designates *any* function defined in the class
-      body via :keyword:`def` or :keyword:`async def`.
-
-      Functions defined in a deeper scope (e.g., in an inner class) are not
-      picked up by :meth:`get_methods`.
-
-      For example:
-
-      .. testsetup:: symtable.Class.get_methods
-
-         import warnings
-         context = warnings.catch_warnings()
-         context.__enter__()
-         warnings.simplefilter("ignore", category=DeprecationWarning)
-
-      .. testcleanup:: symtable.Class.get_methods
-
-         context.__exit__()
-
-      .. doctest:: symtable.Class.get_methods
-
-         >>> import symtable
-         >>> st = symtable.symtable('''
-         ... def outer(): pass
-         ...
-         ... class A:
-         ...    def f():
-         ...        def w(): pass
-         ...
-         ...    def g(self): pass
-         ...
-         ...    @classmethod
-         ...    async def h(cls): pass
-         ...
-         ...    global outer
-         ...    def outer(self): pass
-         ... ''', 'test', 'exec')
-         >>> class_A = st.get_children()[2]
-         >>> class_A.get_methods()
-         ('f', 'g', 'h')
-
-      Although ``A().f()`` raises :exc:`TypeError` at runtime, ``A.f`` is still
-      considered as a method-like function.
-
-      .. deprecated-removed:: 3.14 3.16
-
 
 .. class:: Symbol
 

Doc/tools/removed-ids.txt

@@ -8,3 +8,6 @@ c-api/file.html: deprecated-api
 library/asyncio-task.html: terminating-a-task-group
 deprecations/index.html: pending-removal-in-python-3-15
 deprecations/index.html: c-api-pending-removal-in-python-3-15
+
+# Removed APIs
+library/symtable.html: symtable.Class.get_methods

Doc/whatsnew/3.14.rst

@@ -2718,7 +2718,7 @@ New deprecations
   (Contributed by Tian Gao in :gh:`124369` and :gh:`125951`.)
 
 * :mod:`symtable`:
-  Deprecate :meth:`symtable.Class.get_methods` due to the lack of interest,
+  Deprecate :meth:`!symtable.Class.get_methods` due to the lack of interest,
   scheduled for removal in Python 3.16.
   (Contributed by Bénédikt Tran in :gh:`119698`.)
 

Doc/whatsnew/3.16.rst

@@ -114,6 +114,18 @@ annotationlib
   Use :meth:`annotationlib.ForwardRef.evaluate`
   or :func:`typing.evaluate_forward_ref` instead.
 
+functools
+---------
+
+* Calling the Python implementation of :func:`functools.reduce` with *function*
+  or *sequence* as keyword arguments has been deprecated since Python 3.14.
+
+symtable
+--------
+
+* The :meth:`!symtable.Class.get_methods` method
+  which has been deprecated since Python 3.14.
+
 sysconfig
 ---------
 

Lib/asyncio/windows_utils.py

@@ -111,8 +111,9 @@ def fileno(self):
 
     def close(self, *, CloseHandle=_winapi.CloseHandle):
         if self._handle is not None:
-            CloseHandle(self._handle)
+            handle = self._handle
             self._handle = None
+            CloseHandle(handle)
 
     def __del__(self, _warn=warnings.warn):
         if self._handle is not None:

Lib/functools.py

@@ -232,9 +232,9 @@ def __ge__(self, other):
 ### reduce() sequence to a single item
 ################################################################################
 
-_initial_missing = object()
+_initial_missing = sentinel('_initial_missing')
 
-def reduce(function, sequence, initial=_initial_missing):
+def reduce(function, sequence, /, initial=_initial_missing):
     """
     reduce(function, iterable, /[, initial]) -> value
 
@@ -264,6 +264,11 @@ def reduce(function, sequence, initial=_initial_missing):
 
     return value
 
+try:
+    from _functools import reduce
+except ImportError:
+    pass
+
 
 ################################################################################
 ### partial() argument application
@@ -1178,31 +1183,3 @@ def __get__(self, instance, owner=None):
         return val
 
     __class_getitem__ = classmethod(GenericAlias)
-
-def _warn_python_reduce_kwargs(py_reduce):
-    @wraps(py_reduce)
-    def wrapper(*args, **kwargs):
-        if 'function' in kwargs or 'sequence' in kwargs:
-            import os
-            import warnings
-            warnings.warn(
-                'Calling functools.reduce with keyword arguments '
-                '"function" or "sequence" '
-                'is deprecated in Python 3.14 and will be '
-                'forbidden in Python 3.16.',
-                DeprecationWarning,
-                skip_file_prefixes=(os.path.dirname(__file__),))
-        return py_reduce(*args, **kwargs)
-    return wrapper
-
-reduce = _warn_python_reduce_kwargs(reduce)
-del _warn_python_reduce_kwargs
-
-# The import of the C accelerated version of reduce() has been moved
-# here due to gh-121676. In Python 3.16, _warn_python_reduce_kwargs()
-# should be removed and the import block should be moved back right
-# after the definition of reduce().
-try:
-    from _functools import reduce
-except ImportError:
-    pass

Lib/profiling/sampling/_heatmap_assets/heatmap.js

@@ -84,7 +84,7 @@ function showNavigationMenu(button, items, title) {
 
         item.appendChild(funcDiv);
         item.appendChild(createElement('div', 'callee-menu-file', linkData.file));
-        item.addEventListener('click', () => window.location.href = linkData.link);
+        item.addEventListener('click', () => navigateToLine(linkData.link));
         menu.appendChild(item);
     });
 
@@ -105,7 +105,7 @@ function handleNavigationClick(button, e) {
 
     const navData = button.getAttribute('data-nav');
     if (navData) {
-        window.location.href = JSON.parse(navData).link;
+        navigateToLine(JSON.parse(navData).link);
         return;
     }
 
@@ -117,11 +117,29 @@ function handleNavigationClick(button, e) {
     }
 }
 
+function restartLineHighlight(target) {
+    target.style.animation = 'none';
+    // Force style recalculation so restoring the animation restarts it.
+    void target.offsetWidth;
+    target.style.animation = '';
+}
+
+function navigateToLine(link) {
+    const url = new URL(link, window.location.href);
+
+    if (url.href === window.location.href) {
+        scrollToTargetLine();
+    } else {
+        window.location.href = link;
+    }
+}
+
 function scrollToTargetLine() {
     if (!window.location.hash) return;
     const target = document.querySelector(window.location.hash);
     if (target) {
         target.scrollIntoView({ behavior: 'smooth', block: 'start' });
+        restartLineHighlight(target);
     }
 }
 

Lib/profiling/sampling/cli.py

@@ -167,7 +167,9 @@ def _build_child_profiler_args(args):
         child_args.extend(["--mode", mode])
 
     # Format options (skip pstats as it's the default)
-    if args.format != "pstats":
+    if args.format == "diff_flamegraph":
+        child_args.extend(["--diff-flamegraph", args.diff_baseline])
+    elif args.format != "pstats":
         child_args.append(f"--{args.format}")
 
     return child_args

Lib/profiling/sampling/stack_collector.py

@@ -698,6 +698,8 @@ def _add_elided_metadata(self, node, baseline_stats, scale, path):
         func_key = self._extract_func_key(node, self._baseline_collector._string_table)
         current_path = path + (func_key,) if func_key else path
 
+        baseline_self = 0
+        baseline_total = 0
         if func_key and current_path in baseline_stats:
             baseline_data = baseline_stats[current_path]
             baseline_self = baseline_data["self"] * scale