Handle typing changes

Author: A5rocks

src/trio/_core/_local.py

@@ -49,12 +49,11 @@ def get(self, default: T | type[_NoValue] = _NoValue) -> T:
             raise RuntimeError("Cannot be used outside of a run context") from None
         except KeyError:
             # contextvars consistency
-            # `type: ignore` awaiting https://github.com/python/mypy/issues/15553 to be fixed & released
             if default is not _NoValue:
-                return default  # type: ignore[return-value]
+                return default
 
             if self._default is not _NoValue:
-                return self._default  # type: ignore[return-value]
+                return self._default
 
             raise LookupError(self) from None
 

src/trio/_core/_tests/test_asyncgen.py

@@ -306,10 +306,12 @@ def test_delegation_to_existing_hooks() -> None:
 
     def my_firstiter(agen: AsyncGenerator[object, NoReturn]) -> None:
         assert isinstance(agen, AsyncGeneratorType)
+        assert agen.ag_frame is not None
         record.append("firstiter " + agen.ag_frame.f_locals["arg"])
 
     def my_finalizer(agen: AsyncGenerator[object, NoReturn]) -> None:
         assert isinstance(agen, AsyncGeneratorType)
+        assert agen.ag_frame is not None
         record.append("finalizer " + agen.ag_frame.f_locals["arg"])
 
     async def example(arg: str) -> AsyncGenerator[int, None]:

src/trio/_path.py

@@ -263,8 +263,9 @@ def __repr__(self) -> str:
     if sys.version_info >= (3, 13):
         full_match = _wrap_method(pathlib.Path.full_match)
 
+    # TODO: only allow this for Python <3.19.
     def as_uri(self) -> str:
-        return pathlib.Path.as_uri(self)
+        return pathlib.PurePath.as_uri(self)
 
 
 if Path.relative_to.__doc__:  # pragma: no branch

src/trio/_socket.py

@@ -338,7 +338,7 @@ def fromshare(info: bytes) -> SocketType:
 else:
     FamilyDefault: None = None
     FamilyT: TypeAlias = int | AddressFamily | None
-    TypeT: TypeAlias = _stdlib_socket.socket | int
+    TypeT: TypeAlias = _stdlib_socket.SocketKind | int
 
 
 @_wraps(_stdlib_socket.socketpair, assigned=(), updated=())

src/trio/_util.py

@@ -298,7 +298,8 @@ def name_asyncgen(agen: AsyncGeneratorType[object, NoReturn]) -> str:
     if not hasattr(agen, "ag_code"):  # pragma: no cover
         return repr(agen)
     try:
-        module = agen.ag_frame.f_globals["__name__"]
+        # `agen.ag_frame` can be None, but we catch AttributeError.
+        module = agen.ag_frame.f_globals["__name__"]  # type: ignore[union-attr]
     except (AttributeError, KeyError):
         module = f"<{agen.ag_code.co_filename}>"
     try: