chore: more shifts towards expect_ (#432)

Author: pavelfeldman

playwright/_impl/_async_base.py

@@ -31,6 +31,9 @@ def __init__(self, future: asyncio.Future) -> None:
     async def value(self) -> T:
         return mapping.from_maybe_impl(await self._future)
 
+    def is_done(self) -> bool:
+        return self._future.done()
+
 
 class AsyncEventContextManager(Generic[T]):
     def __init__(self, future: asyncio.Future) -> None:

playwright/_impl/_browser_context.py

@@ -247,7 +247,7 @@ async def wait_for_event(
     ) -> Any:
         async with self.expect_event(event, predicate, timeout) as event_info:
             pass
-        return await event_info.value
+        return await event_info
 
     def expect_page(
         self,

playwright/_impl/_event_context_manager.py

@@ -18,25 +18,16 @@
 T = TypeVar("T")
 
 
-class EventInfoImpl(Generic[T]):
-    def __init__(self, future: asyncio.Future) -> None:
-        self._future = future
-
-    @property
-    async def value(self) -> T:
-        return await self._future
-
-
 class EventContextManagerImpl(Generic[T]):
     def __init__(self, future: asyncio.Future) -> None:
-        self._event: EventInfoImpl = EventInfoImpl(future)
+        self._future: asyncio.Future = future
 
     @property
     def future(self) -> asyncio.Future:
-        return self._event._future
+        return self._future
 
-    async def __aenter__(self) -> EventInfoImpl[T]:
-        return self._event
+    async def __aenter__(self) -> asyncio.Future:
+        return self._future
 
     async def __aexit__(self, *args: Any) -> None:
-        await self._event.value
+        await self._future

playwright/_impl/_frame.py

@@ -529,15 +529,3 @@ async def wait_for_function(
 
     async def title(self) -> str:
         return await self._channel.send("title")
-
-    async def wait_for_navigation(
-        self,
-        url: URLMatch = None,
-        waitUntil: DocumentLoadState = None,
-        timeout: float = None,
-    ) -> Optional[Response]:
-        async with self.expect_navigation(
-            url, waitUntil, timeout=timeout
-        ) as response_info:
-            pass
-        return await response_info.value

playwright/_impl/_network.py

@@ -322,7 +322,7 @@ async def wait_for_event(
     ) -> Any:
         async with self.expect_event(event, predicate, timeout) as event_info:
             pass
-        return await event_info.value
+        return await event_info
 
     def _on_frame_sent(self, opcode: int, data: str) -> None:
         if opcode == 2:

playwright/_impl/_page.py

@@ -483,38 +483,12 @@ async def wait_for_load_state(
     ) -> None:
         return await self._main_frame.wait_for_load_state(**locals_to_params(locals()))
 
-    async def wait_for_navigation(
-        self,
-        url: URLMatch = None,
-        waitUntil: DocumentLoadState = None,
-        timeout: float = None,
-    ) -> Optional[Response]:
-        return await self._main_frame.wait_for_navigation(**locals_to_params(locals()))
-
-    async def wait_for_request(
-        self,
-        urlOrPredicate: URLMatchRequest,
-        timeout: float = None,
-    ) -> Request:
-        async with self.expect_request(urlOrPredicate, timeout) as request_info:
-            pass
-        return await request_info.value
-
-    async def wait_for_response(
-        self,
-        urlOrPredicate: URLMatchResponse,
-        timeout: float = None,
-    ) -> Response:
-        async with self.expect_response(urlOrPredicate, timeout) as request_info:
-            pass
-        return await request_info.value
-
     async def wait_for_event(
         self, event: str, predicate: Callable = None, timeout: float = None
     ) -> Any:
         async with self.expect_event(event, predicate, timeout) as event_info:
             pass
-        return await event_info.value
+        return await event_info
 
     async def go_back(
         self,
@@ -851,7 +825,7 @@ def expect_navigation(
         url: URLMatch = None,
         wait_until: DocumentLoadState = None,
         timeout: float = None,
-    ) -> EventContextManagerImpl:
+    ) -> EventContextManagerImpl[Response]:
         return self.main_frame.expect_navigation(url, wait_until, timeout)
 
     def expect_popup(

playwright/_impl/_sync_base.py

@@ -52,6 +52,9 @@ def value(self) -> T:
             raise self._exception
         return cast(T, self._value)
 
+    def is_done(self) -> bool:
+        return self._future.done()
+
 
 class EventContextManager(Generic[T]):
     def __init__(self, sync_base: "SyncBase", future: asyncio.Future) -> None: