Better pass through

 - Fix a few typos
 - Remove unnecessary generic function infrastructure
 - Deduplicate `from typing import ...` imports
 - Fix codecov complains

Author: A5rocks

.github/workflows/ci.yml

@@ -228,7 +228,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['pypy-3.11', '3.10', '3.10', '3.11', '3.12', '3.13', '3.14']
+        python: ['pypy-3.11', '3.10', '3.11', '3.12', '3.13', '3.14']
         check_formatting: ['0']
         no_test_requirements: ['0']
         extra_name: ['']

src/trio/_channel.py

@@ -44,20 +44,6 @@
         P = ParamSpec("P")
 
 
-def _open_memory_channel(
-    max_buffer_size: int | float,  # noqa: PYI041
-) -> tuple[MemorySendChannel[T], MemoryReceiveChannel[T]]:
-    if max_buffer_size != inf and not isinstance(max_buffer_size, int):
-        raise TypeError("max_buffer_size must be an integer or math.inf")
-    if max_buffer_size < 0:
-        raise ValueError("max_buffer_size must be >= 0")
-    state: MemoryChannelState[T] = MemoryChannelState(max_buffer_size)
-    return (
-        MemorySendChannel[T]._create(state),
-        MemoryReceiveChannel[T]._create(state),
-    )
-
-
 # written as a class so you can say open_memory_channel[int](5)
 @final
 class open_memory_channel(tuple["MemorySendChannel[T]", "MemoryReceiveChannel[T]"]):
@@ -110,14 +96,21 @@ class open_memory_channel(tuple["MemorySendChannel[T]", "MemoryReceiveChannel[T]
       channel (summing over all clones).
     * ``tasks_waiting_receive``: The number of tasks blocked in ``receive`` on
       this channel (summing over all clones).
-
     """
 
     def __new__(  # type: ignore[misc]  # "must return a subtype"
         cls,
         max_buffer_size: int | float,  # noqa: PYI041
     ) -> tuple[MemorySendChannel[T], MemoryReceiveChannel[T]]:
-        return _open_memory_channel(max_buffer_size)
+        if max_buffer_size != inf and not isinstance(max_buffer_size, int):
+            raise TypeError("max_buffer_size must be an integer or math.inf")
+        if max_buffer_size < 0:
+            raise ValueError("max_buffer_size must be >= 0")
+        state: MemoryChannelState[T] = MemoryChannelState(max_buffer_size)
+        return (
+            MemorySendChannel[T]._create(state),
+            MemoryReceiveChannel[T]._create(state),
+        )
 
     def __init__(self, max_buffer_size: int | float) -> None:  # noqa: PYI041
         ...

src/trio/_core/_exceptions.py

@@ -1,15 +1,14 @@
 from __future__ import annotations
 
 from functools import partial
-from typing import TYPE_CHECKING, Literal
+from typing import TYPE_CHECKING, Literal, TypeAlias
 
 import attrs
 
 from trio._util import NoPublicConstructor, final
 
 if TYPE_CHECKING:
     from collections.abc import Callable
-    from typing import TypeAlias
 
     from typing_extensions import Self
 

src/trio/_core/_io_epoll.py

@@ -4,7 +4,7 @@
 import select
 import sys
 from collections import defaultdict
-from typing import TYPE_CHECKING, Literal
+from typing import TYPE_CHECKING, Literal, TypeAlias
 
 import attrs
 
@@ -14,8 +14,6 @@
 from ._wakeup_socketpair import WakeupSocketpair
 
 if TYPE_CHECKING:
-    from typing import TypeAlias
-
     from .._core import Abort, RaiseCancelT
     from .._file_io import _HasFileNo
 

src/trio/_core/_io_kqueue.py

@@ -4,7 +4,7 @@
 import select
 import sys
 from contextlib import contextmanager
-from typing import TYPE_CHECKING, Literal
+from typing import TYPE_CHECKING, Literal, TypeAlias
 
 import attrs
 import outcome
@@ -15,7 +15,6 @@
 
 if TYPE_CHECKING:
     from collections.abc import Callable, Iterator
-    from typing import TypeAlias
 
     from .._core import Abort, RaiseCancelT, Task, UnboundedQueue
     from .._file_io import _HasFileNo

src/trio/_core/_io_windows.py

@@ -5,13 +5,7 @@
 import socket
 import sys
 from contextlib import contextmanager
-from typing import (
-    TYPE_CHECKING,
-    Literal,
-    Protocol,
-    TypeVar,
-    cast,
-)
+from typing import TYPE_CHECKING, Literal, Protocol, TypeAlias, TypeVar, cast
 
 import attrs
 from outcome import Value
@@ -41,7 +35,6 @@
 
 if TYPE_CHECKING:
     from collections.abc import Callable, Iterator
-    from typing import TypeAlias
 
     from typing_extensions import Buffer
 

src/trio/_core/_ki.py

@@ -2,9 +2,8 @@
 
 import signal
 import sys
-import types
 import weakref
-from typing import TYPE_CHECKING, Generic, Protocol, TypeVar
+from typing import TYPE_CHECKING, Generic, Protocol, TypeGuard, TypeVar
 
 import attrs
 
@@ -14,7 +13,6 @@
 if TYPE_CHECKING:
     import types
     from collections.abc import Callable
-    from typing import TypeGuard
 
     from typing_extensions import Self
 # In ordinary single-threaded Python code, when you hit control-C, it raises

src/trio/_core/_tests/test_guest_mode.py

@@ -17,6 +17,7 @@
 from typing import (
     TYPE_CHECKING,
     NoReturn,
+    TypeAlias,
     TypeVar,
     cast,
 )
@@ -32,8 +33,6 @@
 from .tutil import gc_collect_harder, restore_unraisablehook
 
 if TYPE_CHECKING:
-    from typing import TypeAlias
-
     from trio._channel import MemorySendChannel
 
 T = TypeVar("T")

src/trio/_core/_traps.py

@@ -4,10 +4,17 @@
 
 import enum
 import types
+from collections.abc import Callable
 
 # typing.Callable is necessary because collections.abc.Callable breaks
 # test_static_tool_sees_all_symbols in 3.10.
-from typing import TYPE_CHECKING, Any, Callable, NoReturn, cast  # noqa: UP035
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    NoReturn,
+    TypeAlias,
+    cast,
+)
 
 import attrs
 import outcome
@@ -16,7 +23,6 @@
 
 if TYPE_CHECKING:
     from collections.abc import Awaitable, Generator
-    from typing import TypeAlias
 
     from ._run import Task
 

src/trio/_core/_windows_cffi.py

@@ -1,11 +1,9 @@
 from __future__ import annotations
 
 import enum
-from typing import TYPE_CHECKING, NewType, NoReturn, Protocol, cast
+from typing import TYPE_CHECKING, NewType, NoReturn, Protocol, TypeAlias, cast
 
 if TYPE_CHECKING:
-    from typing import TypeAlias
-
     import cffi
 
     CData: TypeAlias = cffi.api.FFI.CData