refactor: DisposableStub takes parent ChannelOwner, align _sync with SyncBase

Author: Skn0tt

playwright/_impl/_browser_context.py

@@ -438,9 +438,7 @@ async def route(
             ),
         )
         await self._update_interception_patterns()
-        return DisposableStub(
-            lambda: self.unroute(url, handler), self._loop, self._dispatcher_fiber
-        )
+        return DisposableStub(lambda: self.unroute(url, handler), self)
 
     async def unroute(
         self, url: URLMatch, handler: Optional[RouteHandlerCallback] = None

playwright/_impl/_disposable.py

@@ -15,7 +15,6 @@
 import asyncio
 import inspect
 import traceback
-from asyncio import AbstractEventLoop
 from typing import Awaitable, Callable, Dict
 
 import greenlet
@@ -51,12 +50,11 @@ class DisposableStub:
     def __init__(
         self,
         dispose_fn: Callable[[], Awaitable[None]],
-        loop: AbstractEventLoop,
-        dispatcher_fiber: object,
+        parent: ChannelOwner,
     ) -> None:
         self._dispose_fn = dispose_fn
-        self._loop = loop
-        self._dispatcher_fiber = dispatcher_fiber
+        self._loop = parent._loop
+        self._dispatcher_fiber = parent._dispatcher_fiber
 
     async def dispose(self) -> None:
         await self._dispose_fn()
@@ -74,7 +72,9 @@ def __exit__(self, *args: object) -> None:
         self._sync(self.dispose())
 
     def _sync(self, coro: object) -> object:
+        __tracebackhide__ = True
         if self._loop.is_closed():
+            coro.close()  # type: ignore
             raise Error("Event loop is closed! Is Playwright already stopped?")
         g_self = greenlet.getcurrent()
         task = self._loop.create_task(coro)  # type: ignore

playwright/_impl/_page.py

@@ -690,9 +690,7 @@ async def route(
             ),
         )
         await self._update_interception_patterns()
-        return DisposableStub(
-            lambda: self.unroute(url, handler), self._loop, self._dispatcher_fiber
-        )
+        return DisposableStub(lambda: self.unroute(url, handler), self)
 
     async def unroute(
         self, url: URLMatch, handler: Optional[RouteHandlerCallback] = None

playwright/_impl/_screencast.py

@@ -71,7 +71,7 @@ async def start(
             self._artifact = from_channel(result)
             self._save_path = path
 
-        return DisposableStub(lambda: self.stop(), self._loop, self._dispatcher_fiber)
+        return DisposableStub(lambda: self.stop(), self._page)
 
     async def stop(self) -> None:
         self._started = False
@@ -95,9 +95,7 @@ async def show_actions(
             None,
             {"duration": duration, "position": position, "fontSize": fontSize},
         )
-        return DisposableStub(
-            lambda: self.hide_actions(), self._loop, self._dispatcher_fiber
-        )
+        return DisposableStub(lambda: self.hide_actions(), self._page)
 
     async def hide_actions(self) -> None:
         await self._page._channel.send("screencastHideActions", None)
@@ -115,8 +113,7 @@ async def show_overlay(self, html: str, duration: float = None) -> DisposableStu
                 None,
                 {"id": overlay_id},
             ),
-            self._loop,
-            self._dispatcher_fiber,
+            self._page,
         )
 
     async def show_chapter(

playwright/_impl/_tracing.py

@@ -144,9 +144,7 @@ async def group(
         self, name: str, location: TracingGroupLocation = None
     ) -> DisposableStub:
         await self._channel.send("tracingGroup", None, locals_to_params(locals()))
-        return DisposableStub(
-            lambda: self.group_end(), self._loop, self._dispatcher_fiber
-        )
+        return DisposableStub(lambda: self.group_end(), self)
 
     async def group_end(self) -> None:
         await self._channel.send(