seleniumbase 4.32.10__py3-none-any.whl → 4.32.10a2__py3-none-any.whl

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.32.10"
+__version__ = "4.32.10a2"

seleniumbase/core/browser_launcher.py

@@ -544,8 +544,6 @@ def uc_open_with_cdp_mode(driver, url=None):
     )
     loop.run_until_complete(driver.cdp_base.wait(0))
 
-    gui_lock = fasteners.InterProcessLock(constants.MultiBrowser.PYAUTOGUILOCK)
-
     if (
         "chrome-extension://" in str(driver.cdp_base.main_tab)
         and len(driver.cdp_base.tabs) >= 2
@@ -555,8 +553,7 @@ def uc_open_with_cdp_mode(driver, url=None):
 
         for tab in driver.cdp_base.tabs[-1::-1]:
             if "chrome-extension://" not in str(tab):
-                with gui_lock:
-                    loop.run_until_complete(tab.activate())
+                loop.run_until_complete(tab.activate())
                 break
 
         page_tab = None
@@ -569,20 +566,14 @@ def uc_open_with_cdp_mode(driver, url=None):
                     break
         if page_tab:
             loop.run_until_complete(page_tab.aopen())
-            with gui_lock:
-                loop.run_until_complete(page_tab.activate())
+            loop.run_until_complete(page_tab.activate())
 
     loop.run_until_complete(driver.cdp_base.update_targets())
     page = loop.run_until_complete(driver.cdp_base.get(url))
-    with gui_lock:
-        loop.run_until_complete(page.activate())
+    loop.run_until_complete(page.activate())
     loop.run_until_complete(page.wait())
     if not safe_url:
         time.sleep(constants.UC.CDP_MODE_OPEN_WAIT)
-        if IS_WINDOWS:
-            time.sleep(constants.UC.EXTRA_WINDOWS_WAIT)
-    else:
-        time.sleep(0.012)
     cdp = types.SimpleNamespace()
     CDPM = sb_cdp.CDPMethods(loop, page, driver)
     cdp.get = CDPM.get
@@ -618,6 +609,7 @@ def uc_open_with_cdp_mode(driver, url=None):
     cdp.remove_element = CDPM.remove_element
     cdp.remove_from_dom = CDPM.remove_from_dom
     cdp.remove_elements = CDPM.remove_elements
+    cdp.scroll_into_view = CDPM.scroll_into_view
     cdp.send_keys = CDPM.send_keys
     cdp.press_keys = CDPM.press_keys
     cdp.type = CDPM.type
@@ -688,12 +680,8 @@ def uc_open_with_cdp_mode(driver, url=None):
     cdp.assert_title = CDPM.assert_title
     cdp.assert_text = CDPM.assert_text
     cdp.assert_exact_text = CDPM.assert_exact_text
-    cdp.scroll_into_view = CDPM.scroll_into_view
-    cdp.scroll_to_y = CDPM.scroll_to_y
-    cdp.scroll_to_top = CDPM.scroll_to_top
-    cdp.scroll_to_bottom = CDPM.scroll_to_bottom
-    cdp.scroll_up = CDPM.scroll_up
     cdp.scroll_down = CDPM.scroll_down
+    cdp.scroll_up = CDPM.scroll_up
     cdp.save_screenshot = CDPM.save_screenshot
     cdp.page = page  # async world
     cdp.driver = driver.cdp_base  # async world
@@ -1257,18 +1245,12 @@ def _uc_gui_click_captcha(
                     return
         if x and y:
             sb_config._saved_cf_x_y = (x, y)
-            if not __is_cdp_swap_needed(driver):
-                if driver.is_element_present(".footer .clearfix .ray-id"):
-                    driver.uc_open_with_disconnect(
-                        driver.get_current_url(), 3.8
-                    )
-                else:
-                    driver.disconnect()
+            if driver.is_element_present(".footer .clearfix .ray-id"):
+                driver.uc_open_with_disconnect(driver.get_current_url(), 3.8)
+            else:
+                driver.disconnect()
             with suppress(Exception):
                 _uc_gui_click_x_y(driver, x, y, timeframe=0.32)
-                if __is_cdp_swap_needed(driver):
-                    time.sleep(float(constants.UC.RECONNECT_TIME) / 2.0)
-                    return
     reconnect_time = (float(constants.UC.RECONNECT_TIME) / 2.0) + 0.6
     if IS_LINUX:
         reconnect_time = constants.UC.RECONNECT_TIME + 0.2

seleniumbase/core/sb_cdp.py

@@ -89,10 +89,6 @@ class CDPMethods():
             safe_url = False
         if not safe_url:
             time.sleep(constants.UC.CDP_MODE_OPEN_WAIT)
-            if shared_utils.is_windows():
-                time.sleep(constants.UC.EXTRA_WINDOWS_WAIT)
-        else:
-            time.sleep(0.012)
         self.__slow_mode_pause_if_set()
         self.loop.run_until_complete(self.page.wait())
 
@@ -582,6 +578,9 @@ class CDPMethods():
         with suppress(Exception):
             self.loop.run_until_complete(self.page.evaluate(js_code))
 
+    def scroll_into_view(self, selector):
+        self.find_element(selector).scroll_into_view()
+
     def send_keys(self, selector, text, timeout=settings.SMALL_TIMEOUT):
         self.__slow_mode_pause_if_set()
         element = self.select(selector, timeout=timeout)
@@ -1522,36 +1521,15 @@ class CDPMethods():
             % (text, element.text_all, selector)
         )
 
-    def scroll_into_view(self, selector):
-        self.find_element(selector).scroll_into_view()
-        self.loop.run_until_complete(self.page.wait())
-
-    def scroll_to_y(self, y):
-        y = int(y)
-        js_code = "window.scrollTo(0, %s);" % y
-        with suppress(Exception):
-            self.loop.run_until_complete(self.page.evaluate(js_code))
-            self.loop.run_until_complete(self.page.wait())
-
-    def scroll_to_top(self):
-        js_code = "window.scrollTo(0, 0);"
-        with suppress(Exception):
-            self.loop.run_until_complete(self.page.evaluate(js_code))
-            self.loop.run_until_complete(self.page.wait())
-
-    def scroll_to_bottom(self):
-        js_code = "window.scrollTo(0, 10000);"
-        with suppress(Exception):
-            self.loop.run_until_complete(self.page.evaluate(js_code))
-            self.loop.run_until_complete(self.page.wait())
+    def scroll_down(self, amount=25):
+        self.loop.run_until_complete(
+            self.page.scroll_down(amount)
+        )
 
     def scroll_up(self, amount=25):
-        self.loop.run_until_complete(self.page.scroll_up(amount))
-        self.loop.run_until_complete(self.page.wait())
-
-    def scroll_down(self, amount=25):
-        self.loop.run_until_complete(self.page.scroll_down(amount))
-        self.loop.run_until_complete(self.page.wait())
+        self.loop.run_until_complete(
+            self.page.scroll_up(amount)
+        )
 
     def save_screenshot(self, name, folder=None, selector=None):
         filename = name

seleniumbase/core/sb_driver.py

@@ -249,11 +249,8 @@ class DriverMethods():
                 selector = kwargs["selector"]
             else:
                 selector = args[0]
-            if ":contains(" not in selector:
-                self.driver.cdp.highlight(selector)
-                return
-            else:
-                self.driver.connect()
+            self.driver.cdp.highlight(selector)
+            return
         if "scroll" in kwargs:
             kwargs.pop("scroll")
         w_args = kwargs.copy()

seleniumbase/fixtures/base_case.py

@@ -6144,9 +6144,6 @@ class BaseCase(unittest.TestCase):
         original_selector = selector
         original_by = by
         selector, by = self.__recalculate_selector(selector, by)
-        if self.__is_cdp_swap_needed() and ":contains(" not in selector:
-            self.cdp.scroll_into_view(selector)
-            return
         element = self.wait_for_element_visible(
             original_selector, by=original_by, timeout=timeout
         )
@@ -6193,36 +6190,24 @@ class BaseCase(unittest.TestCase):
     def scroll_to_top(self):
         """Scroll to the top of the page."""
         self.__check_scope()
-        if self.__is_cdp_swap_needed():
-            self.cdp.scroll_to_top()
-            return
         scroll_script = "window.scrollTo(0, 0);"
-        with suppress(Exception):
+        try:
             self.execute_script(scroll_script)
             time.sleep(0.012)
+            return True
+        except Exception:
+            return False
 
     def scroll_to_bottom(self):
         """Scroll to the bottom of the page."""
         self.__check_scope()
-        if self.__is_cdp_swap_needed():
-            self.cdp.scroll_to_bottom()
-            return
         scroll_script = "window.scrollTo(0, 10000);"
-        with suppress(Exception):
-            self.execute_script(scroll_script)
-            time.sleep(0.012)
-
-    def scroll_to_y(self, y):
-        """Scroll to y position on the page."""
-        self.__check_scope()
-        y = int(y)
-        if self.__is_cdp_swap_needed():
-            self.cdp.scroll_to_y(y)
-            return
-        scroll_script = "window.scrollTo(0, %s);" % y
-        with suppress(Exception):
+        try:
             self.execute_script(scroll_script)
             time.sleep(0.012)
+            return True
+        except Exception:
+            return False
 
     def click_xpath(self, xpath):
         """Technically, self.click() automatically detects xpath selectors,

seleniumbase/fixtures/constants.py

@@ -376,7 +376,6 @@ class Mobile:
 class UC:
     RECONNECT_TIME = 2.4  # Seconds
     CDP_MODE_OPEN_WAIT = 0.9  # Seconds
-    EXTRA_WINDOWS_WAIT = 0.2  # Seconds
 
 
 class ValidBrowsers:

seleniumbase/fixtures/js_utils.py

@@ -10,7 +10,6 @@ from seleniumbase import config as sb_config
 from seleniumbase.config import settings
 from seleniumbase.fixtures import constants
 from seleniumbase.fixtures import css_to_xpath
-from seleniumbase.fixtures import shared_utils
 from seleniumbase.fixtures import xpath_to_css
 
 
@@ -25,6 +24,9 @@ def wait_for_ready_state_complete(driver, timeout=settings.LARGE_TIMEOUT):
     (Previously, tests would fail immediately if exceeding the timeout.)"""
     if hasattr(settings, "SKIP_JS_WAITS") and settings.SKIP_JS_WAITS:
         return
+    if sb_config.time_limit and not sb_config.recorder_mode:
+        from seleniumbase.fixtures import shared_utils
+
     start_ms = time.time() * 1000.0
     stop_ms = start_ms + (timeout * 1000.0)
     for x in range(int(timeout * 10)):
@@ -241,6 +243,8 @@ def escape_quotes_if_needed(string):
 def is_in_frame(driver):
     # Returns True if the driver has switched to a frame.
     # Returns False if the driver was on default content.
+    from seleniumbase.fixtures import shared_utils
+
     if shared_utils.is_cdp_swap_needed(driver):
         return False
     in_basic_frame = driver.execute_script(

seleniumbase/fixtures/page_actions.py

@@ -1555,6 +1555,8 @@ def _reconnect_if_disconnected(driver):
     if (
         hasattr(driver, "_is_using_uc")
         and driver._is_using_uc
+        and hasattr(driver, "_is_connected")
+        and not driver._is_connected
         and hasattr(driver, "is_connected")
         and not driver.is_connected()
     ):

seleniumbase/fixtures/shared_utils.py

@@ -84,17 +84,6 @@ def fix_url_as_needed(url):
     return url
 
 
-def reconnect_if_disconnected(driver):
-    if (
-        hasattr(driver, "_is_using_uc")
-        and driver._is_using_uc
-        and hasattr(driver, "is_connected")
-        and not driver.is_connected()
-    ):
-        with suppress(Exception):
-            driver.connect()
-
-
 def is_cdp_swap_needed(driver):
     """
     When someone is using CDP Mode with a disconnected webdriver,

{seleniumbase-4.32.10.dist-info → seleniumbase-4.32.10a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seleniumbase
-Version: 4.32.10
+Version: 4.32.10a2
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -127,7 +127,7 @@ Requires-Dist: allure-behave>=2.13.5; extra == "allure"
 Provides-Extra: coverage
 Requires-Dist: coverage>=7.6.1; python_version < "3.9" and extra == "coverage"
 Requires-Dist: pytest-cov>=5.0.0; python_version < "3.9" and extra == "coverage"
-Requires-Dist: coverage>=7.6.5; python_version >= "3.9" and extra == "coverage"
+Requires-Dist: coverage>=7.6.4; python_version >= "3.9" and extra == "coverage"
 Requires-Dist: pytest-cov>=6.0.0; python_version >= "3.9" and extra == "coverage"
 Provides-Extra: flake8
 Requires-Dist: mccabe==0.7.0; extra == "flake8"

{seleniumbase-4.32.10.dist-info → seleniumbase-4.32.10a2.dist-info}/RECORD

@@ -3,7 +3,7 @@ sbase/__main__.py,sha256=G0bVB1-DM4PGwQ1KyOupaWCs4ePbChZNNWuX2htim5U,647
 sbase/steps.py,sha256=bKT_u5bJkKzYWEuAXi9NVVRYYxQRCM1_YJUrNFFRVPY,42865
 seleniumbase/__init__.py,sha256=OtJh8nGKL4xtZpw8KPqmn7Q6R-86t4cWUDyVF5MbMTo,2398
 seleniumbase/__main__.py,sha256=dn1p6dgCchmcH1zzTzzQvFwwdQQqnTGH6ULV9m4hv24,654
-seleniumbase/__version__.py,sha256=EprvPOPeyt2vgaXwlIQ3r-LOIidKOMXwSmL8ZGhDzGs,47
+seleniumbase/__version__.py,sha256=DhXDI1N_CDARJMnRISb4c1sjUq05uNArv7Z4T6iANno,49
 seleniumbase/behave/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 seleniumbase/behave/behave_helper.py,sha256=elkl8P9eLulRAioLstE9baYNM9N_PHBmAOcajX-pH_Y,24198
 seleniumbase/behave/behave_sb.py,sha256=-hza7Nx2U41mSObYiPMi48v3JlPh3sJO3yzP0kqZ1Gk,59174
@@ -36,7 +36,7 @@ seleniumbase/console_scripts/sb_print.py,sha256=tNy-bMDgwHJO3bZxMpmo9weSE8uhbH0C
 seleniumbase/console_scripts/sb_recorder.py,sha256=1oAA4wFzVboNhIFDwJLD3jgy9RuoavywKQG7R67bNZE,10908
 seleniumbase/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 seleniumbase/core/application_manager.py,sha256=e_0sjtI8cjY5BNyZj1QBR0j6_oCScxGmSXYEpcYwuZE,576
-seleniumbase/core/browser_launcher.py,sha256=FkUH7Q1VdUuvL7IMnz3ajIX0Ii3wSN8D4_XjE40aoYw,219757
+seleniumbase/core/browser_launcher.py,sha256=fsq6Ip_2C5Ih_TsOr5-5kU1gPS0mSwG_2DkJbMB_Is0,219081
 seleniumbase/core/capabilities_parser.py,sha256=meIS2uHapTCq2ldfNAToC7r0cKmZDRXuYNKExM1GHDY,6038
 seleniumbase/core/colored_traceback.py,sha256=DrRWfg7XEnKcgY59Xj7Jdk09H-XqHYBSUpB-DiZt6iY,2020
 seleniumbase/core/create_db_tables.sql,sha256=VWPtrdiW_HQ6yETHjqTu-VIrTwvd8I8o1NfBeaVSHpU,972
@@ -50,8 +50,8 @@ seleniumbase/core/proxy_helper.py,sha256=cXhu8ErK9Vjdm82RMaQj7hEq_yUWizSp6LyiD50
 seleniumbase/core/recorder_helper.py,sha256=fNGjbapXmEsht54x1o6Igk198QdnPxDDnjUOzQxNhNQ,25055
 seleniumbase/core/report_helper.py,sha256=AIl6Qava2yW1uSzbLpJBlPlYDz0KE-rVhogh8hsGWBo,12201
 seleniumbase/core/s3_manager.py,sha256=bkeI8I4y19ebWuQG1oEZV5qJbotC6eN8vin31OCNWJk,3521
-seleniumbase/core/sb_cdp.py,sha256=ZppRZe-YtJ_e_lUC9yfWg-LN5IL9mDEgTQixVZfVDDQ,60593
-seleniumbase/core/sb_driver.py,sha256=xMgtvBitEMr73RkqgQLT-3IvkP6sh7cJv-caCUPoO-o,12179
+seleniumbase/core/sb_cdp.py,sha256=CPQvyJ8v_xozVdGt5g9JFjo0aYsLaOEm9gnthpysrOc,59586
+seleniumbase/core/sb_driver.py,sha256=Yd9BpjnOUuZqYRGmsERVKc1W-e8qwTt7SAytLatkXPA,12070
 seleniumbase/core/session_helper.py,sha256=s9zD3PVZEWVzG2h81cCUskbNWLfdjC_LwwQjKptHCak,558
 seleniumbase/core/settings_parser.py,sha256=KokVXpCiGZhJ-D4Bo-hizPz5r-iefzWoiTANu9zNaq4,7504
 seleniumbase/core/style_sheet.py,sha256=tPpJ1xl6Kuw425Z-3Y0OgVRLGXk_ciBDREZjXk_NuPE,11395
@@ -65,14 +65,14 @@ seleniumbase/extensions/disable_csp.zip,sha256=YMifIIgEBiLrEFrS1sfW4Exh4br1V4oK1
 seleniumbase/extensions/recorder.zip,sha256=OOyzF-Ize2cSRu1CqhzSAq5vusI9hqLLd2OIApUHesI,11918
 seleniumbase/extensions/sbase_ext.zip,sha256=3s1N8zrVaMz8RQEOIoBzC3KDjtmHwVZRvVsX25Odr_s,8175
 seleniumbase/fixtures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-seleniumbase/fixtures/base_case.py,sha256=LHDJZlL0aRzi4XyIXrds0xl84_eFllI_jpEcE3zSj5o,713463
-seleniumbase/fixtures/constants.py,sha256=HdNtH4rXT_wRpRCtj6jF2jZ5z_0Xs4nveKRXDg3bZZE,13649
+seleniumbase/fixtures/base_case.py,sha256=ad--jkCZk2CTzXXk4_ncrI8nqWgHhGPjVmS3vHhnplQ,712849
+seleniumbase/fixtures/constants.py,sha256=XYYMpB-ZDI756LvfhSK9RxdqQ_qO9fJVXgBqBYlQNkk,13609
 seleniumbase/fixtures/css_to_xpath.py,sha256=9ouDB1xl4MJ2os6JOgTIAyHKOQfuxtxvXC3O5hSnEKA,1954
 seleniumbase/fixtures/errors.py,sha256=KyxuEVx_e3MPhVrJfNIa_3ltMpbCFxfy_jxK8RFNTns,555
-seleniumbase/fixtures/js_utils.py,sha256=2l4UY_zUBsMviRoJpLA0z3XxhGeLMWj0Mv07FUR_jzg,50939
-seleniumbase/fixtures/page_actions.py,sha256=dbp63c-7asYZyd8aOu57Y3dxQQozp_VJsP5h74s1kBA,66552
+seleniumbase/fixtures/js_utils.py,sha256=5o4CTLcCyd717lJ_atOYcC6kPRiZFx-LJIlixRrP_cE,51061
+seleniumbase/fixtures/page_actions.py,sha256=fOCb2NB2PpEaE8gpAVu-73VjwLzfwP1R9HsRkix_z6s,66634
 seleniumbase/fixtures/page_utils.py,sha256=5m7iXpikLs80TJoRO6_gEfXE1AKeQgcH1aFbR8o1C9A,12034
-seleniumbase/fixtures/shared_utils.py,sha256=WbPb15IvIWzRtMInKG8DUzJ26UZU-PixdOwTCjXQirU,7545
+seleniumbase/fixtures/shared_utils.py,sha256=MwCrt58YAv_XrfNfYjo_quUTWfYArlnf-aexSZGIyRs,7271
 seleniumbase/fixtures/unittest_helper.py,sha256=sfZ92rZeBAn_sF_yQ3I6_I7h3lyU5-cV_UMegBNoEm8,1294
 seleniumbase/fixtures/words.py,sha256=FOA4mAYvl3EPVpBTvgvK6YwCL8BdlRCmed685kEe7Vg,7827
 seleniumbase/fixtures/xpath_to_css.py,sha256=lML56k656fElXJ4NJF07r35FjctrbgQkXUotNk7A-as,8876
@@ -135,9 +135,9 @@ seleniumbase/utilities/selenium_grid/start-grid-hub.bat,sha256=Ftq-GrAKRYH2ssDPr
 seleniumbase/utilities/selenium_grid/start-grid-hub.sh,sha256=KADv0RUHONLL2_I443QFK8PryBpDmKn5Gy0s4o0vDSM,106
 seleniumbase/utilities/selenium_ide/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 seleniumbase/utilities/selenium_ide/convert_ide.py,sha256=pZFnqEJQEKZPyNFjkLD29s2HPQgCrWW9XJWpCPhWOoM,31691
-seleniumbase-4.32.10.dist-info/LICENSE,sha256=odSYtWibXBnQ1gBg6CnDZ82n8kLF_if5-2nbqnEyD8k,1085
-seleniumbase-4.32.10.dist-info/METADATA,sha256=PBD6feJ0a7cOUVtkmkomDeGJJaKnkXfRY9zoKoW0aNs,86462
-seleniumbase-4.32.10.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-seleniumbase-4.32.10.dist-info/entry_points.txt,sha256=CNrh2EKNaHYEhO6pP1RJyVLB99LkDDYX7TnUK8xfjqk,623
-seleniumbase-4.32.10.dist-info/top_level.txt,sha256=4N97aBOQ8ETCnDnokBsWb07lJfTaq3C1ZzYRxvLMxqU,19
-seleniumbase-4.32.10.dist-info/RECORD,,
+seleniumbase-4.32.10a2.dist-info/LICENSE,sha256=odSYtWibXBnQ1gBg6CnDZ82n8kLF_if5-2nbqnEyD8k,1085
+seleniumbase-4.32.10a2.dist-info/METADATA,sha256=0JyQxemq40Q9x2UAb9NuhSv78XL2Kjg7VsnDCxvBhqw,86464
+seleniumbase-4.32.10a2.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+seleniumbase-4.32.10a2.dist-info/entry_points.txt,sha256=CNrh2EKNaHYEhO6pP1RJyVLB99LkDDYX7TnUK8xfjqk,623
+seleniumbase-4.32.10a2.dist-info/top_level.txt,sha256=4N97aBOQ8ETCnDnokBsWb07lJfTaq3C1ZzYRxvLMxqU,19
+seleniumbase-4.32.10a2.dist-info/RECORD,,