Fix black formatting and address review feedback

Remove trivial availability helpers from the private API and inline the
Windows/admin checks in integration test skipif predicates.

Co-authored-by: Olivier Grisel <olivier.grisel@ensta.org>

Author: cursoragent

threadpoolctl/_thread_tracer/__init__.py

@@ -1,32 +1,10 @@
 """Private experimental thread spawn tracer (not part of the public API)."""
 
-import sys
-
 from threadpoolctl._thread_tracer._types import ThreadSpawnStats, ThreadTracerError
 from threadpoolctl._thread_tracer._windows_etw import WindowsThreadSpawnTracer
 
-
-def windows_tracer_available():
-    """Return whether the Windows ETW tracer can run on this platform."""
-    return sys.platform == "win32"
-
-
-def windows_etw_admin_available():
-    """Return whether the current process can start kernel ETW sessions."""
-    if not windows_tracer_available():
-        return False
-    try:
-        import ctypes
-
-        return bool(ctypes.windll.shell32.IsUserAnAdmin())
-    except (AttributeError, OSError):
-        return False
-
-
 __all__ = [
     "ThreadSpawnStats",
     "ThreadTracerError",
     "WindowsThreadSpawnTracer",
-    "windows_etw_admin_available",
-    "windows_tracer_available",
 ]

threadpoolctl/_thread_tracer/_windows_etw.py

@@ -59,7 +59,7 @@ def from_string(cls, guid_string):
         guid.Data3 = int(parts[2], 16)
         hex_data4 = parts[3] + parts[4]
         for index in range(8):
-            guid.Data4[index] = int(hex_data4[index * 2:index * 2 + 2], 16)
+            guid.Data4[index] = int(hex_data4[index * 2 : index * 2 + 2], 16)
         return guid
 
 
@@ -188,9 +188,7 @@ def _ensure_advapi32():
         return _advapi32
 
     if sys.platform != "win32":
-        raise ThreadTracerError(
-            "Windows ETW tracer is only supported on Windows"
-        )
+        raise ThreadTracerError("Windows ETW tracer is only supported on Windows")
 
     _advapi32 = ct.windll.advapi32
 
@@ -232,7 +230,9 @@ def _ensure_advapi32():
 
 def _make_trace_properties(enable_flags):
     max_str_len = 1024
-    buf_size = ct.sizeof(EVENT_TRACE_PROPERTIES) + 2 * ct.sizeof(ct.c_wchar) * max_str_len
+    buf_size = (
+        ct.sizeof(EVENT_TRACE_PROPERTIES) + 2 * ct.sizeof(ct.c_wchar) * max_str_len
+    )
     buf = (ct.c_char * buf_size)()
     props = ct.cast(ct.pointer(buf), ct.POINTER(EVENT_TRACE_PROPERTIES))
 

threadpoolctl/tests/test_windows_thread_tracer.py

@@ -1,5 +1,4 @@
 import struct
-import sys
 
 import pytest
 
@@ -10,7 +9,6 @@
     classify_kernel_thread_event,
     parse_kernel_thread_payload,
 )
-from threadpoolctl._thread_tracer import windows_tracer_available
 
 
 def _pack_thread_payload(process_id, thread_id):
@@ -42,7 +40,3 @@ def test_classify_kernel_thread_event_ignores_other_process():
 
 def test_parse_kernel_thread_payload_rejects_short_buffers():
     assert parse_kernel_thread_payload(b"\x01\x02\x03", 3) is None
-
-
-def test_windows_tracer_available_matches_platform():
-    assert windows_tracer_available() == (sys.platform == "win32")

threadpoolctl/tests/test_windows_thread_tracer_integration.py

@@ -1,3 +1,4 @@
+import ctypes
 import os
 import subprocess
 import sys
@@ -6,20 +7,15 @@
 
 import pytest
 
-from threadpoolctl._thread_tracer import (
-    ThreadTracerError,
-    WindowsThreadSpawnTracer,
-    windows_etw_admin_available,
-    windows_tracer_available,
-)
+from threadpoolctl._thread_tracer import ThreadTracerError, WindowsThreadSpawnTracer
 
 pytestmark = [
     pytest.mark.skipif(
-        not windows_tracer_available(),
+        sys.platform != "win32",
         reason="Windows ETW integration tests require Windows",
     ),
     pytest.mark.skipif(
-        not windows_etw_admin_available(),
+        sys.platform == "win32" and not ctypes.windll.shell32.IsUserAnAdmin(),
         reason="Windows ETW kernel tracing requires an elevated process",
     ),
 ]
@@ -69,15 +65,13 @@ def _configure_blas_thread_env():
 
 
 def _child_script(body):
-    return textwrap.dedent(
-        """
+    return textwrap.dedent("""
         import time
 
         time.sleep({attach_delay})
         {body}
         time.sleep({flush_delay})
-        """
-    ).format(
+        """).format(
         attach_delay=TRACER_ATTACH_DELAY_SECONDS,
         body=textwrap.indent(textwrap.dedent(body).strip(), "    "),
         flush_delay=TRACER_FLUSH_DELAY_SECONDS,
@@ -88,9 +82,7 @@ def _run_traced_child(body, minimum_spawn_count):
     env = os.environ.copy()
     pythonpath = env.get("PYTHONPATH", "")
     env["PYTHONPATH"] = (
-        str(REPO_ROOT)
-        if not pythonpath
-        else str(REPO_ROOT) + os.pathsep + pythonpath
+        str(REPO_ROOT) if not pythonpath else str(REPO_ROOT) + os.pathsep + pythonpath
     )
 
     proc = subprocess.Popen(
@@ -116,13 +108,12 @@ def _run_traced_child(body, minimum_spawn_count):
 
     stats = tracer.stop()
     assert return_code == 0, "traced child exited with code {0}".format(return_code)
-    assert stats.spawn_count >= minimum_spawn_count, (
-        "expected at least {expected} thread spawn events, got {actual} ({stats})"
-        .format(
-            expected=minimum_spawn_count,
-            actual=stats.spawn_count,
-            stats=stats,
-        )
+    assert (
+        stats.spawn_count >= minimum_spawn_count
+    ), "expected at least {expected} thread spawn events, got {actual} ({stats})".format(
+        expected=minimum_spawn_count,
+        actual=stats.spawn_count,
+        stats=stats,
     )
     return stats