Switch context collections to sets due to duplicate events

Author: agg23

playwright/_impl/_browser.py

@@ -14,7 +14,17 @@
 
 from pathlib import Path
 from types import SimpleNamespace
-from typing import TYPE_CHECKING, Dict, List, Optional, Pattern, Sequence, Union, cast
+from typing import (
+    TYPE_CHECKING,
+    Dict,
+    List,
+    Optional,
+    Pattern,
+    Sequence,
+    Set,
+    Union,
+    cast,
+)
 
 from playwright._impl._api_structures import (
     ClientCertificate,
@@ -60,7 +70,7 @@ def __init__(
         self._should_close_connection_on_close = False
         self._cr_tracing_path: Optional[str] = None
 
-        self._contexts: List[BrowserContext] = []
+        self._contexts: Set[BrowserContext] = set()
         self._traces_dir: Optional[str] = None
         self._channel.on(
             "context",
@@ -88,7 +98,7 @@ def _connect_to_browser_type(
 
     def _did_create_context(self, context: BrowserContext) -> None:
         context._browser = self
-        self._contexts.append(context)
+        self._contexts.add(context)
         # Note: when connecting to a browser, initial contexts arrive before `_browserType` is set,
         # and will be configured later in `ConnectToBrowserType`.
         if self._browser_type:
@@ -97,15 +107,15 @@ def _did_create_context(self, context: BrowserContext) -> None:
     def _setup_browser_context(self, context: BrowserContext) -> None:
         context._tracing._traces_dir = self._traces_dir
         print("Appending context to selectors")
-        self._browser_type._playwright.selectors._contextsForSelectors.append(context)
+        self._browser_type._playwright.selectors._contextsForSelectors.add(context)
 
     def _on_close(self) -> None:
         self._is_connected = False
         self.emit(Browser.Events.Disconnected, self)
 
     @property
     def contexts(self) -> List[BrowserContext]:
-        return self._contexts.copy()
+        return list(self._contexts)
 
     @property
     def browser_type(self) -> "BrowserType":

playwright/_impl/_browser_context.py

@@ -574,7 +574,7 @@ def _on_close(self) -> None:
         if self._browser:
             try:
                 self._browser._contexts.remove(self)
-            except ValueError:
+            except KeyError:
                 print("Context already removed from browser contexts")
                 pass
             try:
@@ -586,7 +586,7 @@ def _on_close(self) -> None:
                     "Successfully removed context from browser selectors",
                     self._browser._browser_type._playwright.selectors._contextsForSelectors,
                 )
-            except ValueError:
+            except KeyError:
                 print("Context already removed from browser selectors")
                 pass
 

playwright/_impl/_selectors.py

@@ -14,7 +14,7 @@
 
 import asyncio
 from pathlib import Path
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional, Set, Union
 
 from playwright._impl._browser_context import BrowserContext
 from playwright._impl._errors import Error
@@ -25,7 +25,7 @@
 class Selectors:
     def __init__(self, loop: asyncio.AbstractEventLoop, dispatcher_fiber: Any) -> None:
         self._loop = loop
-        self._contextsForSelectors: List[BrowserContext] = []
+        self._contextsForSelectors: Set[BrowserContext] = set()
         self._selectorEngines: List[Dict] = []
         self._dispatcher_fiber = dispatcher_fiber
         self._testIdAttributeName: Optional[str] = None