Merge branch 'main' to fix conflicts (actually this time)

Author: johnslavik

.github/CODEOWNERS

@@ -298,8 +298,7 @@ InternalDocs/jit.md           @brandtbucher @savannahostrowski @diegorusso @AA-T
 # Lazy imports (PEP 810)
 Objects/lazyimportobject.c                  @yhg1s @DinoV @pablogsal
 Include/internal/pycore_lazyimportobject.h  @yhg1s @DinoV @pablogsal
-Lib/test/test_import/test_lazy_imports.py   @yhg1s @DinoV @pablogsal
-Lib/test/test_import/data/lazy_imports/     @yhg1s @DinoV @pablogsal
+Lib/test/test_lazy_import                   @yhg1s @DinoV @pablogsal
 
 # Micro-op / μop / Tier 2 Optimiser
 Python/optimizer.c            @markshannon @Fidget-Spinner

Lib/profiling/sampling/sample.py

@@ -164,7 +164,8 @@ def sample(self, collector, duration_sec=None, *, async_aware=False):
         # Don't print stats for live mode (curses is handling display)
         is_live_mode = LiveStatsCollector is not None and isinstance(collector, LiveStatsCollector)
         if not is_live_mode:
-            print(f"Captured {num_samples:n} samples in {fmt(running_time_sec, 2)} seconds")
+            s = "" if num_samples == 1 else "s"
+            print(f"Captured {num_samples:n} sample{s} in {fmt(running_time_sec, 2)} seconds")
             print(f"Sample rate: {fmt(sample_rate, 2)} samples/sec")
             print(f"Error rate: {fmt(error_rate, 2)}")
 

Lib/profiling/sampling/stack_collector.py

@@ -144,9 +144,13 @@ def export(self, filename):
         num_functions = len(flamegraph_data.get("children", []))
         total_time = flamegraph_data.get("value", 0)
         string_count = len(self._string_table)
+        s1 = "" if num_functions == 1 else "s"
+        s2 = "" if total_time == 1 else "s"
+        s3 = "" if string_count == 1 else "s"
         print(
-            f"Flamegraph data: {num_functions} root functions, total samples: {total_time}, "
-            f"{string_count} unique strings"
+            f"Flamegraph data: {num_functions} root function{s1}, "
+            f"{total_time} total sample{s2}, "
+            f"{string_count} unique string{s3}"
         )
 
         if num_functions == 0:

Lib/test/.ruff.toml

@@ -15,8 +15,9 @@ extend-exclude = [
     # and tests re-use the same names as only the grammar is being checked.
     "test_grammar.py",
     # Lazy import syntax (PEP 810) is not yet supported by Ruff
-    "test_import/data/lazy_imports/*.py",
-    "test_import/data/lazy_imports/**/*.py",
+    "test_lazy_import/__init__.py",
+    "test_lazy_import/data/*.py",
+    "test_lazy_import/data/**/*.py",
 ]
 
 [lint]