Fixed overeager timeout conversion in Page

Author: agg23

playwright/_impl/_browser_context.py

@@ -288,19 +288,12 @@ def set_default_navigation_timeout(self, timeout: float) -> None:
 
     def _set_default_navigation_timeout_impl(self, timeout: Optional[float]) -> None:
         self._timeout_settings.set_default_navigation_timeout(timeout)
-        self._channel.send_no_reply(
-            "setDefaultNavigationTimeoutNoReply",
-            {} if timeout is None else {"timeout": timeout},
-        )
 
     def set_default_timeout(self, timeout: float) -> None:
         return self._set_default_timeout_impl(timeout)
 
     def _set_default_timeout_impl(self, timeout: Optional[float]) -> None:
         self._timeout_settings.set_default_timeout(timeout)
-        self._channel.send_no_reply(
-            "setDefaultTimeoutNoReply", {} if timeout is None else {"timeout": timeout}
-        )
 
     @property
     def pages(self) -> List[Page]:

playwright/_impl/_page.py

@@ -418,51 +418,37 @@ async def wait_for_selector(
         state: Literal["attached", "detached", "hidden", "visible"] = None,
         strict: bool = None,
     ) -> Optional[ElementHandle]:
-        return await self._main_frame.wait_for_selector(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.wait_for_selector(**locals_to_params(locals()))
 
     async def is_checked(
         self, selector: str, strict: bool = None, timeout: float = None
     ) -> bool:
-        return await self._main_frame.is_checked(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.is_checked(**locals_to_params(locals()))
 
     async def is_disabled(
         self, selector: str, strict: bool = None, timeout: float = None
     ) -> bool:
-        return await self._main_frame.is_disabled(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.is_disabled(**locals_to_params(locals()))
 
     async def is_editable(
         self, selector: str, strict: bool = None, timeout: float = None
     ) -> bool:
-        return await self._main_frame.is_editable(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.is_editable(**locals_to_params(locals()))
 
     async def is_enabled(
         self, selector: str, strict: bool = None, timeout: float = None
     ) -> bool:
-        return await self._main_frame.is_enabled(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.is_enabled(**locals_to_params(locals()))
 
     async def is_hidden(
         self, selector: str, strict: bool = None, timeout: float = None
     ) -> bool:
-        return await self._main_frame.is_hidden(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.is_hidden(**locals_to_params(locals()))
 
     async def is_visible(
         self, selector: str, strict: bool = None, timeout: float = None
     ) -> bool:
-        return await self._main_frame.is_visible(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.is_visible(**locals_to_params(locals()))
 
     async def dispatch_event(
         self,
@@ -472,9 +458,7 @@ async def dispatch_event(
         timeout: float = None,
         strict: bool = None,
     ) -> None:
-        return await self._main_frame.dispatch_event(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.dispatch_event(**locals_to_params(locals()))
 
     async def evaluate(self, expression: str, arg: Serializable = None) -> Any:
         return await self._main_frame.evaluate(expression, arg)
@@ -510,16 +494,12 @@ async def add_script_tag(
         content: str = None,
         type: str = None,
     ) -> ElementHandle:
-        return await self._main_frame.add_script_tag(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.add_script_tag(**locals_to_params(locals()))
 
     async def add_style_tag(
         self, url: str = None, path: Union[str, Path] = None, content: str = None
     ) -> ElementHandle:
-        return await self._main_frame.add_style_tag(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.add_style_tag(**locals_to_params(locals()))
 
     async def expose_function(self, name: str, callback: Callable) -> None:
         await self.expose_binding(name, lambda source, *args: callback(*args))
@@ -556,9 +536,7 @@ async def set_content(
         timeout: float = None,
         waitUntil: DocumentLoadState = None,
     ) -> None:
-        return await self._main_frame.set_content(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.set_content(**locals_to_params(locals()))
 
     async def goto(
         self,
@@ -567,9 +545,7 @@ async def goto(
         waitUntil: DocumentLoadState = None,
         referer: str = None,
     ) -> Optional[Response]:
-        return await self._main_frame.goto(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.goto(**locals_to_params(locals()))
 
     async def reload(
         self,
@@ -587,19 +563,15 @@ async def wait_for_load_state(
         state: Literal["domcontentloaded", "load", "networkidle"] = None,
         timeout: float = None,
     ) -> None:
-        return await self._main_frame.wait_for_load_state(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.wait_for_load_state(**locals_to_params(locals()))
 
     async def wait_for_url(
         self,
         url: URLMatch,
         waitUntil: DocumentLoadState = None,
         timeout: float = None,
     ) -> None:
-        return await self._main_frame.wait_for_url(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.wait_for_url(**locals_to_params(locals()))
 
     async def wait_for_event(
         self, event: str, predicate: Callable = None, timeout: float = None
@@ -865,9 +837,7 @@ async def click(
         trial: bool = None,
         strict: bool = None,
     ) -> None:
-        return await self._main_frame.click(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.click(**locals_to_params(locals()))
 
     async def dblclick(
         self,
@@ -882,9 +852,7 @@ async def dblclick(
         strict: bool = None,
         trial: bool = None,
     ) -> None:
-        return await self._main_frame.dblclick(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.dblclick(**locals_to_params(locals()))
 
     async def tap(
         self,
@@ -897,9 +865,7 @@ async def tap(
         strict: bool = None,
         trial: bool = None,
     ) -> None:
-        return await self._main_frame.tap(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.tap(**locals_to_params(locals()))
 
     async def fill(
         self,
@@ -910,9 +876,7 @@ async def fill(
         strict: bool = None,
         force: bool = None,
     ) -> None:
-        return await self._main_frame.fill(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.fill(**locals_to_params(locals()))
 
     def locator(
         self,
@@ -990,37 +954,27 @@ def frame_locator(self, selector: str) -> "FrameLocator":
     async def focus(
         self, selector: str, strict: bool = None, timeout: float = None
     ) -> None:
-        return await self._main_frame.focus(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.focus(**locals_to_params(locals()))
 
     async def text_content(
         self, selector: str, strict: bool = None, timeout: float = None
     ) -> Optional[str]:
-        return await self._main_frame.text_content(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.text_content(**locals_to_params(locals()))
 
     async def inner_text(
         self, selector: str, strict: bool = None, timeout: float = None
     ) -> str:
-        return await self._main_frame.inner_text(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.inner_text(**locals_to_params(locals()))
 
     async def inner_html(
         self, selector: str, strict: bool = None, timeout: float = None
     ) -> str:
-        return await self._main_frame.inner_html(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.inner_html(**locals_to_params(locals()))
 
     async def get_attribute(
         self, selector: str, name: str, strict: bool = None, timeout: float = None
     ) -> Optional[str]:
-        return await self._main_frame.get_attribute(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.get_attribute(**locals_to_params(locals()))
 
     async def hover(
         self,
@@ -1033,9 +987,7 @@ async def hover(
         strict: bool = None,
         trial: bool = None,
     ) -> None:
-        return await self._main_frame.hover(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.hover(**locals_to_params(locals()))
 
     async def drag_and_drop(
         self,
@@ -1049,9 +1001,7 @@ async def drag_and_drop(
         strict: bool = None,
         trial: bool = None,
     ) -> None:
-        return await self._main_frame.drag_and_drop(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.drag_and_drop(**locals_to_params(locals()))
 
     async def select_option(
         self,
@@ -1065,13 +1015,13 @@ async def select_option(
         force: bool = None,
         strict: bool = None,
     ) -> List[str]:
-        params = self._locals_to_params_with_timeout(locals())
+        params = locals_to_params(locals())
         return await self._main_frame.select_option(**params)
 
     async def input_value(
         self, selector: str, strict: bool = None, timeout: float = None
     ) -> str:
-        params = self._locals_to_params_with_timeout(locals())
+        params = locals_to_params(locals())
         return await self._main_frame.input_value(**params)
 
     async def set_input_files(
@@ -1084,9 +1034,7 @@ async def set_input_files(
         strict: bool = None,
         noWaitAfter: bool = None,
     ) -> None:
-        return await self._main_frame.set_input_files(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.set_input_files(**locals_to_params(locals()))
 
     async def type(
         self,
@@ -1097,9 +1045,7 @@ async def type(
         noWaitAfter: bool = None,
         strict: bool = None,
     ) -> None:
-        return await self._main_frame.type(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.type(**locals_to_params(locals()))
 
     async def press(
         self,
@@ -1124,9 +1070,7 @@ async def check(
         strict: bool = None,
         trial: bool = None,
     ) -> None:
-        return await self._main_frame.check(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.check(**locals_to_params(locals()))
 
     async def uncheck(
         self,
@@ -1138,9 +1082,7 @@ async def uncheck(
         strict: bool = None,
         trial: bool = None,
     ) -> None:
-        return await self._main_frame.uncheck(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.uncheck(**locals_to_params(locals()))
 
     async def wait_for_timeout(self, timeout: float) -> None:
         await self._main_frame.wait_for_timeout(timeout)
@@ -1152,9 +1094,7 @@ async def wait_for_function(
         timeout: float = None,
         polling: Union[float, Literal["raf"]] = None,
     ) -> JSHandle:
-        return await self._main_frame.wait_for_function(
-            **self._locals_to_params_with_timeout(locals())
-        )
+        return await self._main_frame.wait_for_function(**locals_to_params(locals()))
 
     @property
     def workers(self) -> List["Worker"]: