Normalized timeout setting

Author: agg23

playwright/_impl/_connection.py

@@ -56,6 +56,7 @@ def __init__(self, connection: "Connection", object: "ChannelOwner") -> None:
         self._object = object
         self.on("error", lambda exc: self._connection._on_event_listener_error(exc))
         self._is_internal_type = False
+        self._timeout_calculator: Optional[Callable[[Optional[float]], float]] = None
 
     async def send(self, method: str, params: Dict = None) -> Any:
         return await self._connection.wrap_api_call(
@@ -82,6 +83,8 @@ async def _inner_send(
     ) -> Any:
         if params is None:
             params = {}
+        if self._timeout_calculator is not None:
+            params["timeout"] = self._timeout_calculator(params.get("timeout"))
         if self._connection._error:
             error = self._connection._error
             self._connection._error = None
@@ -112,8 +115,10 @@ async def _inner_send(
         key = next(iter(result))
         return result[key]
 
-    def mark_as_internal_type(self) -> None:
-        self._is_internal_type = True
+    def _set_timeout_calculator(
+        self, timeout_calculator: Callable[[Optional[float]], float]
+    ) -> None:
+        self._timeout_calculator = timeout_calculator
 
 
 class ChannelOwner(AsyncIOEventEmitter):

playwright/_impl/_element_handle.py

@@ -56,6 +56,7 @@ def __init__(
     ) -> None:
         super().__init__(parent, type, guid, initializer)
         self._frame = cast("Frame", parent)
+        self._channel._set_timeout_calculator(self._frame._timeout)
 
     async def _createSelectorForTest(self, name: str) -> Optional[str]:
         return await self._channel.send("createSelectorForTest", dict(name=name))
@@ -105,9 +106,7 @@ async def dispatch_event(self, type: str, eventInit: Dict = None) -> None:
         )
 
     async def scroll_into_view_if_needed(self, timeout: float = None) -> None:
-        await self._channel.send(
-            "scrollIntoViewIfNeeded", self._locals_to_params_with_timeout(locals())
-        )
+        await self._channel.send("scrollIntoViewIfNeeded", locals_to_params(locals()))
 
     async def hover(
         self,
@@ -118,7 +117,7 @@ async def hover(
         force: bool = None,
         trial: bool = None,
     ) -> None:
-        await self._channel.send("hover", self._locals_to_params_with_timeout(locals()))
+        await self._channel.send("hover", locals_to_params(locals()))
 
     async def click(
         self,
@@ -132,7 +131,7 @@ async def click(
         noWaitAfter: bool = None,
         trial: bool = None,
     ) -> None:
-        await self._channel.send("click", self._locals_to_params_with_timeout(locals()))
+        await self._channel.send("click", locals_to_params(locals()))
 
     async def dblclick(
         self,
@@ -145,9 +144,7 @@ async def dblclick(
         noWaitAfter: bool = None,
         trial: bool = None,
     ) -> None:
-        await self._channel.send(
-            "dblclick", self._locals_to_params_with_timeout(locals())
-        )
+        await self._channel.send("dblclick", locals_to_params(locals()))
 
     async def select_option(
         self,
@@ -159,7 +156,7 @@ async def select_option(
         force: bool = None,
         noWaitAfter: bool = None,
     ) -> List[str]:
-        params = self._locals_to_params_with_timeout(
+        params = locals_to_params(
             dict(
                 timeout=timeout,
                 force=force,
@@ -177,7 +174,7 @@ async def tap(
         noWaitAfter: bool = None,
         trial: bool = None,
     ) -> None:
-        await self._channel.send("tap", self._locals_to_params_with_timeout(locals()))
+        await self._channel.send("tap", locals_to_params(locals()))
 
     async def fill(
         self,
@@ -186,17 +183,13 @@ async def fill(
         noWaitAfter: bool = None,
         force: bool = None,
     ) -> None:
-        await self._channel.send("fill", self._locals_to_params_with_timeout(locals()))
+        await self._channel.send("fill", locals_to_params(locals()))
 
     async def select_text(self, force: bool = None, timeout: float = None) -> None:
-        await self._channel.send(
-            "selectText", self._locals_to_params_with_timeout(locals())
-        )
+        await self._channel.send("selectText", locals_to_params(locals()))
 
     async def input_value(self, timeout: float = None) -> str:
-        return await self._channel.send(
-            "inputValue", self._locals_to_params_with_timeout(locals())
-        )
+        return await self._channel.send("inputValue", locals_to_params(locals()))
 
     async def set_input_files(
         self,
@@ -228,7 +221,7 @@ async def type(
         timeout: float = None,
         noWaitAfter: bool = None,
     ) -> None:
-        await self._channel.send("type", self._locals_to_params_with_timeout(locals()))
+        await self._channel.send("type", locals_to_params(locals()))
 
     async def press(
         self,
@@ -237,7 +230,7 @@ async def press(
         timeout: float = None,
         noWaitAfter: bool = None,
     ) -> None:
-        await self._channel.send("press", self._locals_to_params_with_timeout(locals()))
+        await self._channel.send("press", locals_to_params(locals()))
 
     async def set_checked(
         self,
@@ -271,7 +264,7 @@ async def check(
         noWaitAfter: bool = None,
         trial: bool = None,
     ) -> None:
-        await self._channel.send("check", self._locals_to_params_with_timeout(locals()))
+        await self._channel.send("check", locals_to_params(locals()))
 
     async def uncheck(
         self,
@@ -281,9 +274,7 @@ async def uncheck(
         noWaitAfter: bool = None,
         trial: bool = None,
     ) -> None:
-        await self._channel.send(
-            "uncheck", self._locals_to_params_with_timeout(locals())
-        )
+        await self._channel.send("uncheck", locals_to_params(locals()))
 
     async def bounding_box(self) -> Optional[FloatRect]:
         return await self._channel.send("boundingBox")
@@ -302,7 +293,7 @@ async def screenshot(
         maskColor: str = None,
         style: str = None,
     ) -> bytes:
-        params = self._locals_to_params_with_timeout(locals())
+        params = locals_to_params(locals())
         if "path" in params:
             del params["path"]
         if "mask" in params:
@@ -378,9 +369,7 @@ async def wait_for_element_state(
         ],
         timeout: float = None,
     ) -> None:
-        await self._channel.send(
-            "waitForElementState", self._locals_to_params_with_timeout(locals())
-        )
+        await self._channel.send("waitForElementState", locals_to_params(locals()))
 
     async def wait_for_selector(
         self,
@@ -390,16 +379,9 @@ async def wait_for_selector(
         strict: bool = None,
     ) -> Optional["ElementHandle"]:
         return from_nullable_channel(
-            await self._channel.send(
-                "waitForSelector", self._locals_to_params_with_timeout(locals())
-            )
+            await self._channel.send("waitForSelector", locals_to_params(locals()))
         )
 
-    def _locals_to_params_with_timeout(self, args: Dict) -> Dict:
-        params = locals_to_params(args)
-        params["timeout"] = self._frame._timeout(params.get("timeout"))
-        return params
-
 
 def convert_select_option_values(
     value: Union[str, Sequence[str]] = None,

playwright/_impl/_fetch.py

@@ -105,6 +105,7 @@ def __init__(
         self._tracing: Tracing = from_channel(initializer["tracing"])
         self._close_reason: Optional[str] = None
         self._timeout_settings = TimeoutSettings(None)
+        self._channel._set_timeout_calculator(self._timeout_settings.timeout)
 
     async def dispose(self, reason: str = None) -> None:
         self._close_reason = reason
@@ -417,7 +418,6 @@ async def _inner_fetch(
                 "jsonData": json_data,
                 "formData": form_data,
                 "multipartData": multipart_data,
-                "timeout": self._timeout_settings.timeout(timeout),
                 "failOnStatusCode": failOnStatusCode,
                 "ignoreHTTPSErrors": ignoreHTTPSErrors,
                 "maxRedirects": maxRedirects,