Fixed the trio backend yielding ints instead of Signals from its sign…

…al receiver

docs/versionhistory.rst

@@ -30,6 +30,8 @@ This library adheres to `Semantic Versioning 2.0 <http:https://semver.org/>`_.
  order (instead of LIFO) (PR by Conor Stevenson)
 - Fixed ``CancelScope.cancel()`` not working on asyncio if called before entering the
  scope
+- Fixed ``open_signal_receiver()`` inconsistently yielding integers instead of
+ ``signal.Signals`` instances on the ``trio`` backend
 
 **3.6.1**
 

src/anyio/_backends/_trio.py

@@ -3,7 +3,7 @@
 import array
 import math
 import socket
-from collections.abc import Iterable
+from collections.abc import AsyncIterator, Iterable
 from concurrent.futures import Future
 from dataclasses import dataclass
 from functools import partial
@@ -674,12 +674,16 @@ def statistics(self) -> CapacityLimiterStatistics:
 #
 
 
-class _SignalReceiver(Generic[T]):
- def __init__(self, cm: ContextManager[T]):
- self._cm = cm
+class _SignalReceiver:
+ _iterator: AsyncIterator[int]
 
- def __enter__(self) -> T:
- return self._cm.__enter__()
+ def __init__(self, signals: tuple[Signals, ...]):
+ self._signals = signals
+
+ def __enter__(self) -> _SignalReceiver:
+ self._cm = trio.open_signal_receiver(*self._signals)
+ self._iterator = self._cm.__enter__()
+ return self
 
  def __exit__(
  self,
@@ -689,6 +693,13 @@ def __exit__(
  ) -> bool | None:
  return self._cm.__exit__(exc_type, exc_val, exc_tb)
 
+ def __aiter__(self) -> _SignalReceiver:
+ return self
+
+ async def __anext__(self) -> Signals:
+ signum = await self._iterator.__anext__()
+ return Signals(signum)
+
 
 #
 # Testing and debugging
@@ -1060,9 +1071,10 @@ def current_default_thread_limiter(cls) -> CapacityLimiter:
  return limiter
 
  @classmethod
- def open_signal_receiver(cls, *signals: Signals) -> ContextManager:
- cm = trio.open_signal_receiver(*signals)
- return _SignalReceiver(cm)
+ def open_signal_receiver(
+ cls, *signals: Signals
+ ) -> ContextManager[AsyncIterator[Signals]]:
+ return _SignalReceiver(signals)
 
  @classmethod
  def get_current_task(cls) -> TaskInfo:

tests/test_signals.py

@@ -23,8 +23,13 @@ async def test_receive_signals() -> None:
  await to_thread.run_sync(os.kill, os.getpid(), signal.SIGUSR1)
  await to_thread.run_sync(os.kill, os.getpid(), signal.SIGUSR2)
  with fail_after(1):
- assert await sigiter.__anext__() == signal.SIGUSR1
- assert await sigiter.__anext__() == signal.SIGUSR2
+ sigusr1 = await sigiter.__anext__()
+ assert isinstance(sigusr1, signal.Signals)
+ assert sigusr1 == signal.Signals.SIGUSR1
+
+ sigusr2 = await sigiter.__anext__()
+ assert isinstance(sigusr2, signal.Signals)
+ assert sigusr2 == signal.Signals.SIGUSR2
 
 
 async def test_task_group_cancellation_open() -> None: