Minor PR cleanup

Author: agg23

playwright/_impl/_browser.py

@@ -106,7 +106,7 @@ def _did_create_context(self, context: BrowserContext) -> None:
 
     def _setup_browser_context(self, context: BrowserContext) -> None:
         context._tracing._traces_dir = self._traces_dir
-        self._browser_type._playwright.selectors._contextsForSelectors.add(context)
+        self._browser_type._playwright.selectors._contexts_for_selectors.add(context)
 
     def _on_close(self) -> None:
         self._is_connected = False

playwright/_impl/_browser_context.py

@@ -116,7 +116,7 @@ def __init__(
         self._bindings: Dict[str, Any] = {}
         self._timeout_settings = TimeoutSettings(None)
         self._owner_page: Optional[Page] = None
-        self._options: Dict[str, Any] = initializer.get("options", {})
+        self._options: Dict[str, Any] = initializer["options"]
         self._background_pages: Set[Page] = set()
         self._service_workers: Set[Worker] = set()
         self._tracing = cast(Tracing, from_channel(initializer["tracing"]))
@@ -313,9 +313,6 @@ async def _initialize_har_from_options(
         if not record_har_path:
             return
         record_har_path = str(record_har_path)
-        if len(record_har_path) == 0:
-            return
-        # Forcibly provide type to satisfy mypy
         default_policy: HarContentPolicy = (
             "attach" if record_har_path.endswith(".zip") else "embed"
         )
@@ -571,16 +568,15 @@ def expect_event(
     def _on_close(self) -> None:
         self._closing_or_closed = True
         if self._browser:
-            try:
+            if self in self._browser._contexts:
                 self._browser._contexts.remove(self)
-            except KeyError:
-                pass
-            try:
-                self._browser._browser_type._playwright.selectors._contextsForSelectors.remove(
+            if (
+                self
+                in self._browser._browser_type._playwright.selectors._contexts_for_selectors
+            ):
+                self._browser._browser_type._playwright.selectors._contexts_for_selectors.remove(
                     self
                 )
-            except KeyError:
-                pass
 
         self._dispose_har_routers()
         self._tracing._reset_stack_counter()

playwright/_impl/_browser_type.py

@@ -326,8 +326,10 @@ async def _prepare_browser_context_params(self, params: Dict) -> None:
             params["clientCertificates"] = await to_client_certificates_protocol(
                 params["clientCertificates"]
             )
-        params["selectorEngines"] = self._playwright.selectors._selectorEngines
-        params["testIdAttributeName"] = self._playwright.selectors._testIdAttributeName
+        params["selectorEngines"] = self._playwright.selectors._selector_engines
+        params["testIdAttributeName"] = (
+            self._playwright.selectors._test_id_attribute_name
+        )
 
         # Remove HAR options
         params.pop("recordHarPath", None)

playwright/_impl/_connection.py

@@ -617,10 +617,6 @@ def _filter_none(d: Mapping) -> Dict:
             filtered_v = _filter_none(v)
             if filtered_v:
                 result[k] = filtered_v
-        elif isinstance(v, Mapping):
-            filtered_v = _filter_none(v)
-            if filtered_v:
-                result[k] = filtered_v
         else:
             result[k] = v
     return result

playwright/_impl/_frame.py

@@ -857,10 +857,3 @@ def _locals_to_params_with_navigation_timeout(self, args: Dict) -> Dict:
         params = locals_to_params(args)
         params["timeout"] = self._navigation_timeout(params.get("timeout"))
         return params
-
-    def _locals_to_params_without_timeout(self, args: Dict) -> Dict:
-        params = locals_to_params(locals())
-        # Timeout is deprecated and does nothing
-        if "timeout" in params:
-            del params["timeout"]
-        return params

playwright/_impl/_selectors.py

@@ -25,10 +25,10 @@
 class Selectors:
     def __init__(self, loop: asyncio.AbstractEventLoop, dispatcher_fiber: Any) -> None:
         self._loop = loop
-        self._contextsForSelectors: Set[BrowserContext] = set()
-        self._selectorEngines: List[Dict] = []
+        self._contexts_for_selectors: Set[BrowserContext] = set()
+        self._selector_engines: List[Dict] = []
         self._dispatcher_fiber = dispatcher_fiber
-        self._testIdAttributeName: Optional[str] = None
+        self._test_id_attribute_name: Optional[str] = None
 
     async def register(
         self,
@@ -44,16 +44,16 @@ async def register(
         engine: Dict[str, Any] = dict(name=name, source=script)
         if contentScript:
             engine["contentScript"] = contentScript
-        for context in self._contextsForSelectors:
+        for context in self._contexts_for_selectors:
             await context._channel.send(
-                "registerSelectorEngine", dict(selectorEngine=engine)
+                "registerSelectorEngine", {"selectorEngine": engine}
             )
-        self._selectorEngines.append(engine)
+        self._selector_engines.append(engine)
 
     def set_test_id_attribute(self, attributeName: str) -> None:
         set_test_id_attribute_name(attributeName)
-        self._testIdAttributeName = attributeName
-        for context in self._contextsForSelectors:
+        self._test_id_attribute_name = attributeName
+        for context in self._contexts_for_selectors:
             context._channel.send_no_reply(
                 "setTestIdAttributeName", {"testIdAttributeName": attributeName}
             )

tests/sync/test_route_web_socket.py

@@ -340,7 +340,7 @@ def _handle_ws(ws: WebSocketRoute) -> None:
             f"message: data=echo origin=ws://localhost:{server.PORT} lastEventId=",
         ],
     )
-    page.close()
+    context.close()
 
 
 def test_should_work_with_no_trailing_slash(page: Page, server: Server) -> None: