Merge pull request #3214 from python-trio/pre-commit-ci-update-config

[pre-commit.ci] pre-commit autoupdate

Author: A5rocks

.pre-commit-config.yaml

@@ -24,7 +24,7 @@ repos:
     hooks:
       - id: black
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.6
+    rev: v0.9.7
     hooks:
       - id: ruff
         types: [file]
@@ -38,7 +38,7 @@ repos:
           # tomli needed on 3.10. tomllib is available in stdlib on 3.11+
           - tomli
   - repo: https://github.com/crate-ci/typos
-    rev: typos-dict-v0.12.5
+    rev: v1.29.9
     hooks:
       - id: typos
   - repo: https://github.com/sphinx-contrib/sphinx-lint
@@ -59,7 +59,7 @@ repos:
         additional_dependencies: ["astor", "attrs", "black", "ruff"]
         files: ^src\/trio\/_core\/(_run|(_i(o_(common|epoll|kqueue|windows)|nstrumentation)))\.py$
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.6.1
+    rev: 0.6.2
     hooks:
       # Compile requirements
       - id: pip-compile

src/trio/_core/_instrumentation.py

@@ -2,6 +2,7 @@
 
 import logging
 import types
+from collections import UserDict
 from typing import TYPE_CHECKING, TypeVar
 
 from .._abc import Instrument
@@ -21,7 +22,7 @@ def _public(fn: T) -> T:
     return fn
 
 
-class Instruments(dict[str, dict[Instrument, None]]):
+class Instruments(UserDict[str, dict[Instrument, None]]):
     """A collection of `trio.abc.Instrument` organized by hook.
 
     Instrumentation calls are rather expensive, and we don't want a
@@ -34,7 +35,7 @@ class Instruments(dict[str, dict[Instrument, None]]):
     __slots__ = ()
 
     def __init__(self, incoming: Sequence[Instrument]) -> None:
-        self["_all"] = {}
+        super().__init__({"_all": {}})
         for instrument in incoming:
             self.add_instrument(instrument)
 
@@ -48,9 +49,9 @@ def add_instrument(self, instrument: Instrument) -> None:
         If ``instrument`` is already active, does nothing.
 
         """
-        if instrument in self["_all"]:
+        if instrument in self.data["_all"]:
             return
-        self["_all"][instrument] = None
+        self.data["_all"][instrument] = None
         try:
             for name in dir(instrument):
                 if name.startswith("_"):
@@ -63,7 +64,7 @@ def add_instrument(self, instrument: Instrument) -> None:
                 if isinstance(impl, types.MethodType) and impl.__func__ is prototype:
                     # Inherited unchanged from _abc.Instrument
                     continue
-                self.setdefault(name, {})[instrument] = None
+                self.data.setdefault(name, {})[instrument] = None
         except:
             self.remove_instrument(instrument)
             raise
@@ -83,12 +84,12 @@ def remove_instrument(self, instrument: Instrument) -> None:
 
         """
         # If instrument isn't present, the KeyError propagates out
-        self["_all"].pop(instrument)
-        for hookname, instruments in list(self.items()):
+        self.data["_all"].pop(instrument)
+        for hookname, instruments in list(self.data.items()):
             if instrument in instruments:
                 del instruments[instrument]
                 if not instruments:
-                    del self[hookname]
+                    del self.data[hookname]
 
     def call(
         self,
@@ -103,7 +104,7 @@ def call(
             if "before_task_step" in instruments:
                 instruments.call("before_task_step", task)
         """
-        for instrument in list(self[hookname]):
+        for instrument in list(self.data[hookname]):
             try:
                 getattr(instrument, hookname)(*args)
             except BaseException:

test-requirements.txt

@@ -130,7 +130,7 @@ pyyaml==6.0.2
     # via pre-commit
 requests==2.32.3
     # via sphinx
-ruff==0.9.6
+ruff==0.9.7
     # via -r test-requirements.in
 sniffio==1.3.1
     # via -r test-requirements.in
@@ -186,7 +186,7 @@ typing-extensions==4.12.2
     #   pyright
 urllib3==2.3.0
     # via requests
-uv==0.6.1
+uv==0.6.2
     # via -r test-requirements.in
 virtualenv==20.29.2
     # via pre-commit