seleniumbase 4.44.2__py3-none-any.whl → 4.45.10__py3-none-any.whl

seleniumbase/plugins/selenium_plugin.py

@@ -22,6 +22,7 @@ class SeleniumBrowser(Plugin):
     --brave  (Shortcut for "--browser=brave".)
     --comet  (Shortcut for "--browser=comet".)
     --atlas  (Shortcut for "--browser=atlas".)
+    --use-chromium  (Shortcut for using base `Chromium`)
     --cft  (Shortcut for using `Chrome for Testing`)
     --chs  (Shortcut for using `Chrome-Headless-Shell`)
     --user-data-dir=DIR  (Set the Chrome user data directory to use.)
@@ -180,6 +181,13 @@ class SeleniumBrowser(Plugin):
             default=False,
             help="""Shortcut for --browser=atlas""",
         )
+        parser.addoption(
+            "--use-chromium",
+            action="store_true",
+            dest="use_chromium",
+            default=False,
+            help="""Shortcut for using base `Chromium`""",
+        )
         parser.addoption(
             "--cft",
             action="store_true",
@@ -367,7 +375,7 @@ class SeleniumBrowser(Plugin):
             help="""Designates the three device metrics of the mobile
                     emulator: CSS Width, CSS Height, and Pixel-Ratio.
                     Format: A comma-separated string with the 3 values.
-                    Examples: "375,734,5" or "411,731,3" or "390,715,3"
+                    Examples: "375,734,5" or "412,732,3" or "390,715,3"
                     Default: None. (Will use default values if None)""",
         )
         parser.addoption(
@@ -1237,9 +1245,11 @@ class SeleniumBrowser(Plugin):
             raise Exception(message)
         if browser_text:
             browser = browser_text
-        if self.options.recorder_mode and browser not in ["chrome", "edge"]:
+        if self.options.recorder_mode and browser not in [
+            "chrome", "edge", "opera", "brave", "comet", "atlas", "chromium"
+        ]:
             message = (
-                "\n\n  Recorder Mode ONLY supports Chrome and Edge!"
+                "\n\n  Recorder Mode ONLY supports Chromium browsers!"
                 '\n  (Your browser choice was: "%s")\n' % browser
             )
             raise Exception(message)
@@ -1338,9 +1348,11 @@ class SeleniumBrowser(Plugin):
         test.test.extension_dir = self.options.extension_dir
         test.test.disable_features = self.options.disable_features
         test.test.binary_location = self.options.binary_location
-        if hasattr(sb_config, "_cdp_bin_loc") and sb_config._cdp_bin_loc:
+        if getattr(sb_config, "_cdp_bin_loc", None):
             test.test.binary_location = sb_config._cdp_bin_loc
-        if self.options.use_cft and not test.test.binary_location:
+        if self.options.use_chromium and not test.test.binary_location:
+            test.test.binary_location = "_chromium_"
+        elif self.options.use_cft and not test.test.binary_location:
             test.test.binary_location = "cft"
         elif self.options.use_chs and not test.test.binary_location:
             test.test.binary_location = "chs"
@@ -1515,10 +1527,7 @@ class SeleniumBrowser(Plugin):
 
     def finalize(self, result):
         """This runs after all tests have completed with nosetests."""
-        if (
-            (hasattr(sb_config, "multi_proxy") and not sb_config.multi_proxy)
-            or not hasattr(sb_config, "multi_proxy")
-        ):
+        if not getattr(sb_config, "multi_proxy", None):
             proxy_helper.remove_proxy_zip_if_present()
 
     def afterTest(self, test):
@@ -1536,8 +1545,7 @@ class SeleniumBrowser(Plugin):
             pass
         with suppress(Exception):
             if (
-                hasattr(self, "_xvfb_display")
-                and self._xvfb_display
+                getattr(self, "_xvfb_display", None)
                 and hasattr(self._xvfb_display, "stop")
             ):
                 self.headless_active = False
@@ -1545,8 +1553,7 @@ class SeleniumBrowser(Plugin):
                 self._xvfb_display.stop()
                 self._xvfb_display = None
             if (
-                hasattr(sb_config, "_virtual_display")
-                and sb_config._virtual_display
+                getattr(sb_config, "_virtual_display", None)
                 and hasattr(sb_config._virtual_display, "stop")
             ):
                 sb_config._virtual_display.stop()

seleniumbase/undetected/__init__.py

@@ -163,7 +163,7 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
         from seleniumbase import config as sb_config
         if (
             (("-n" in sys.argv) or (" -n=" in arg_join) or ("-c" in sys.argv))
-            or (hasattr(sb_config, "multi_proxy") and sb_config.multi_proxy)
+            or getattr(sb_config, "multi_proxy", None)
             or not special_port_free
         ):
             debug_port = selenium.webdriver.common.service.utils.free_port()
@@ -197,9 +197,7 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
                 except IndexError:
                     pass
         if not user_data_dir:
-            if hasattr(options, "user_data_dir") and getattr(
-                options, "user_data_dir", None
-            ):
+            if getattr(options, "user_data_dir", None):
                 options.add_argument(
                     "--user-data-dir=%s" % options.user_data_dir
                 )
@@ -405,9 +403,7 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
 
     def add_cdp_listener(self, event_name, callback):
         if (
-            hasattr(self, "reactor")
-            and self.reactor
-            and self.reactor is not None
+            getattr(self, "reactor", None)
             and isinstance(self.reactor, Reactor)
         ):
             self.reactor.add_event_handler(event_name, callback)
@@ -416,8 +412,7 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
 
     def clear_cdp_listeners(self):
         if (
-            hasattr(self, "reactor")
-            and self.reactor
+            getattr(self, "reactor", None)
             and isinstance(self.reactor, Reactor)
         ):
             self.reactor.handlers.clear()
@@ -526,7 +521,13 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
         with suppress(Exception):
             for window_handle in self.window_handles:
                 self.switch_to.window(window_handle)
-                if self.current_url.startswith("chrome-extension://"):
+                current_url = None
+                if hasattr(self, "cdp") and hasattr(self.cdp, "driver"):
+                    with suppress(Exception):
+                        current_url = self.cdp.get_current_url()
+                if not current_url:
+                    current_url = self.current_url
+                if current_url.startswith("chrome-extension://"):
                     # https://issues.chromium.org/issues/396611138
                     # (Remove the Linux conditional when resolved)
                     # (So that close() is always called)

seleniumbase/undetected/cdp.py

@@ -1,9 +1,7 @@
-import fasteners
 import json
 import logging
 import requests
-from seleniumbase.fixtures import constants
-from seleniumbase.fixtures import shared_utils
+import websockets
 
 log = logging.getLogger(__name__)
 
@@ -107,15 +105,6 @@ class CDP:
             return resp.json()
 
     async def send(self, method, params):
-        pip_find_lock = fasteners.InterProcessLock(
-            constants.PipInstall.FINDLOCK
-        )
-        with pip_find_lock:
-            try:
-                import websockets
-            except Exception:
-                shared_utils.pip_install("websockets")
-                import websockets
         self._reqid += 1
         async with websockets.connect(self.wsurl) as ws:
             await ws.send(