Add distinction between error cases in TimerContext

aio-libs · Dec 11, 2024 · 6faaa4d · 6faaa4d
1 parent 3f07b1a
commit 6faaa4d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -140,6 +140,7 @@ Frederik Peter Aalund
 Gabriel Tremblay
 Gang Ji
 Gary Wilson Jr.
+Gary Yendell
 Gennady Andreyev
 Georges Dubus
 Greg Holt

diff --git a/aiohttp/helpers.py b/aiohttp/helpers.py
@@ -658,7 +658,14 @@ def assert_timeout(self) -> None:
     def __enter__(self) -> BaseTimerContext:
         task = asyncio.current_task(loop=self._loop)
         if task is None:
-            raise RuntimeError("Timeout context manager should be used inside a task")
+            if asyncio.current_task() is not None:
+                raise RuntimeError(
+                    "Timeout context manager used in a task on a different event loop"
+                )
+            else:
+                raise RuntimeError(
+                    "Timeout context manager should be used inside a task"
+                )
 
         if sys.version_info >= (3, 11):
             # Remember if the task was already cancelling