chore: filter_none by default (microsoft#2173)

mxschmitt · web-flow · commit 85df32c24e4d · 2023-11-27T11:37:21.000-08:00
diff --git a/playwright/_impl/_browser.py b/playwright/_impl/_browser.py
@@ -27,7 +27,7 @@
 from playwright._impl._artifact import Artifact
 from playwright._impl._browser_context import BrowserContext
 from playwright._impl._cdp_session import CDPSession
-from playwright._impl._connection import ChannelOwner, filter_none, from_channel
+from playwright._impl._connection import ChannelOwner, from_channel
 from playwright._impl._errors import is_target_closed_error
 from playwright._impl._helper import (
     ColorScheme,
@@ -183,7 +183,7 @@ async def close(self, reason: str = None) -> None:
             if self._should_close_connection_on_close:
                 await self._connection.stop_async()
             else:
-                await self._channel.send("close", filter_none({"reason": reason}))
+                await self._channel.send("close", {"reason": reason})
         except Exception as e:
             if not is_target_closed_error(e):
                 raise e
diff --git a/playwright/_impl/_browser_context.py b/playwright/_impl/_browser_context.py
@@ -40,7 +40,6 @@
 from playwright._impl._cdp_session import CDPSession
 from playwright._impl._connection import (
     ChannelOwner,
-    filter_none,
     from_channel,
     from_nullable_channel,
 )
@@ -482,7 +481,7 @@ async def _inner_close() -> None:
                 await har.delete()
 
         await self._channel._connection.wrap_api_call(_inner_close, True)
-        await self._channel.send("close", filter_none({"reason": reason}))
+        await self._channel.send("close", {"reason": reason})
         await self._closed_future
 
     async def storage_state(self, path: Union[str, Path] = None) -> StorageState:
diff --git a/playwright/_impl/_browser_type.py b/playwright/_impl/_browser_type.py
@@ -28,7 +28,6 @@
 from playwright._impl._connection import (
     ChannelOwner,
     Connection,
-    filter_none,
     from_channel,
     from_nullable_channel,
 )
@@ -200,15 +199,13 @@ async def connect(
         pipe_channel = (
             await local_utils._channel.send_return_as_dict(
                 "connect",
-                filter_none(
-                    {
-                        "wsEndpoint": ws_endpoint,
-                        "headers": headers,
-                        "slowMo": slow_mo,
-                        "timeout": timeout,
-                        "exposeNetwork": expose_network,
-                    }
-                ),
+                {
+                    "wsEndpoint": ws_endpoint,
+                    "headers": headers,
+                    "slowMo": slow_mo,
+                    "timeout": timeout,
+                    "exposeNetwork": expose_network,
+                },
             )
         )["pipe"]
         transport = JsonPipeTransport(self._connection._loop, pipe_channel)
diff --git a/playwright/_impl/_connection.py b/playwright/_impl/_connection.py
@@ -82,7 +82,7 @@ async def inner_send(
         if params is None:
             params = {}
         callback = self._connection._send_message_to_server(
-            self._object, method, params
+            self._object, method, _filter_none(params)
         )
         if self._connection._error:
             error = self._connection._error
@@ -565,7 +565,7 @@ def _extract_stack_trace_information_from_stack(
     }
 
 
-def filter_none(d: Mapping) -> Dict:
+def _filter_none(d: Mapping) -> Dict:
     return {k: v for k, v in d.items() if v is not None}
 
 
diff --git a/playwright/_impl/_element_handle.py b/playwright/_impl/_element_handle.py
@@ -18,11 +18,7 @@
 from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Union, cast
 
 from playwright._impl._api_structures import FilePayload, FloatRect, Position
-from playwright._impl._connection import (
-    ChannelOwner,
-    filter_none,
-    from_nullable_channel,
-)
+from playwright._impl._connection import ChannelOwner, from_nullable_channel
 from playwright._impl._helper import (
     Error,
     KeyboardModifier,
@@ -202,7 +198,8 @@ async def set_input_files(
         await self._channel.send(
             "setInputFiles",
             {
-                **filter_none({"timeout": timeout, "noWaitAfter": noWaitAfter}),
+                "timeout": timeout,
+                "noWaitAfter": noWaitAfter,
                 **converted,
             },
         )
@@ -408,4 +405,4 @@ def convert_select_option_values(
             element = [element]
         elements = list(map(lambda e: e._channel, element))
 
-    return filter_none(dict(options=options, elements=elements))
+    return dict(options=options, elements=elements)
diff --git a/playwright/_impl/_fetch.py b/playwright/_impl/_fetch.py
@@ -29,7 +29,7 @@
     ServerFilePayload,
     StorageState,
 )
-from playwright._impl._connection import ChannelOwner, filter_none, from_channel
+from playwright._impl._connection import ChannelOwner, from_channel
 from playwright._impl._errors import is_target_closed_error
 from playwright._impl._helper import (
     Error,
@@ -368,22 +368,20 @@ async def _inner_fetch(
 
         response = await self._channel.send(
             "fetch",
-            filter_none(
-                {
-                    "url": url,
-                    "params": object_to_array(params),
-                    "method": method,
-                    "headers": serialized_headers,
-                    "postData": post_data,
-                    "jsonData": json_data,
-                    "formData": form_data,
-                    "multipartData": multipart_data,
-                    "timeout": timeout,
-                    "failOnStatusCode": failOnStatusCode,
-                    "ignoreHTTPSErrors": ignoreHTTPSErrors,
-                    "maxRedirects": maxRedirects,
-                }
-            ),
+            {
+                "url": url,
+                "params": object_to_array(params),
+                "method": method,
+                "headers": serialized_headers,
+                "postData": post_data,
+                "jsonData": json_data,
+                "formData": form_data,
+                "multipartData": multipart_data,
+                "timeout": timeout,
+                "failOnStatusCode": failOnStatusCode,
+                "ignoreHTTPSErrors": ignoreHTTPSErrors,
+                "maxRedirects": maxRedirects,
+            },
         )
         return APIResponse(self, response)
 
diff --git a/playwright/_impl/_frame.py b/playwright/_impl/_frame.py
@@ -22,7 +22,6 @@
 from playwright._impl._api_structures import AriaRole, FilePayload, Position
 from playwright._impl._connection import (
     ChannelOwner,
-    filter_none,
     from_channel,
     from_nullable_channel,
 )
@@ -694,14 +693,10 @@ async def set_input_files(
         await self._channel.send(
             "setInputFiles",
             {
-                **filter_none(
-                    {
-                        "selector": selector,
-                        "strict": strict,
-                        "timeout": timeout,
-                        "noWaitAfter": noWaitAfter,
-                    }
-                ),
+                "selector": selector,
+                "strict": strict,
+                "timeout": timeout,
+                "noWaitAfter": noWaitAfter,
                 **converted,
             },
         )
diff --git a/playwright/_impl/_locator.py b/playwright/_impl/_locator.py
@@ -38,7 +38,6 @@
     FrameExpectResult,
     Position,
 )
-from playwright._impl._connection import filter_none
 from playwright._impl._element_handle import ElementHandle
 from playwright._impl._helper import (
     Error,
@@ -707,7 +706,7 @@ async def _expect(
             {
                 "selector": self._selector,
                 "expression": expression,
-                **(filter_none(options)),
+                **options,
             },
         )
         if result.get("received"):
diff --git a/playwright/_impl/_network.py b/playwright/_impl/_network.py
@@ -51,7 +51,6 @@
 )
 from playwright._impl._connection import (
     ChannelOwner,
-    filter_none,
     from_channel,
     from_nullable_channel,
 )
@@ -303,12 +302,10 @@ async def abort(self, errorCode: str = None) -> None:
         await self._race_with_page_close(
             self._channel.send(
                 "abort",
-                filter_none(
-                    {
-                        "errorCode": errorCode,
-                        "requestUrl": self.request._initializer["url"],
-                    }
-                ),
+                {
+                    "errorCode": errorCode,
+                    "requestUrl": self.request._initializer["url"],
+                },
             )
         )
         self._report_handled(True)
diff --git a/playwright/_impl/_tracing.py b/playwright/_impl/_tracing.py
@@ -16,11 +16,7 @@
 from typing import Dict, Optional, Union, cast
 
 from playwright._impl._artifact import Artifact
-from playwright._impl._connection import (
-    ChannelOwner,
-    filter_none,
-    from_nullable_channel,
-)
+from playwright._impl._connection import ChannelOwner, from_nullable_channel
 from playwright._impl._helper import locals_to_params
 
 
@@ -48,7 +44,7 @@ async def start(
         async def _inner_start() -> str:
             await self._channel.send("tracingStart", params)
             return await self._channel.send(
-                "tracingStartChunk", filter_none({"title": title, "name": name})
+                "tracingStartChunk", {"title": title, "name": name}
             )
 
         trace_name = await self._connection.wrap_api_call(_inner_start, True)

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ async def inner_send(`
`82`	`82`	`if params is None:`
`83`	`83`	`params = {}`
`84`	`84`	`callback = self._connection._send_message_to_server(`
`85`		`- self._object, method, params`
	`85`	`+ self._object, method, _filter_none(params)`
`86`	`86`	`)`
`87`	`87`	`if self._connection._error:`
`88`	`88`	`error = self._connection._error`
`@@ -565,7 +565,7 @@ def _extract_stack_trace_information_from_stack(`
`565`	`565`	`}`
`566`	`566`
`567`	`567`
`568`		`-def filter_none(d: Mapping) -> Dict:`
	`568`	`+def _filter_none(d: Mapping) -> Dict:`
`569`	`569`	`return {k: v for k, v in d.items() if v is not None}`
`570`	`570`
`571`	`571`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,6 @@`
`38`	`38`	`FrameExpectResult,`
`39`	`39`	`Position,`
`40`	`40`	`)`
`41`		`-from playwright._impl._connection import filter_none`
`42`	`41`	`from playwright._impl._element_handle import ElementHandle`
`43`	`42`	`from playwright._impl._helper import (`
`44`	`43`	`Error,`
`@@ -707,7 +706,7 @@ async def _expect(`
`707`	`706`	`{`
`708`	`707`	`"selector": self._selector,`
`709`	`708`	`"expression": expression,`
`710`		`- **(filter_none(options)),`
	`709`	`+ **options,`
`711`	`710`	`},`
`712`	`711`	`)`
`713`	`712`	`if result.get("received"):`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,6 @@`
`51`	`51`	`)`
`52`	`52`	`from playwright._impl._connection import (`
`53`	`53`	`ChannelOwner,`
`54`		`- filter_none,`
`55`	`54`	`from_channel,`
`56`	`55`	`from_nullable_channel,`
`57`	`56`	`)`
`@@ -303,12 +302,10 @@ async def abort(self, errorCode: str = None) -> None:`
`303`	`302`	`await self._race_with_page_close(`
`304`	`303`	`self._channel.send(`
`305`	`304`	`"abort",`
`306`		`- filter_none(`
`307`		`- {`
`308`		`- "errorCode": errorCode,`
`309`		`- "requestUrl": self.request._initializer["url"],`
`310`		`- }`
`311`		`- ),`
	`305`	`+ {`
	`306`	`+ "errorCode": errorCode,`
	`307`	`+ "requestUrl": self.request._initializer["url"],`
	`308`	`+ },`
`312`	`309`	`)`
`313`	`310`	`)`
`314`	`311`	`self._report_handled(True)`