seleniumbase 4.29.4__py3-none-any.whl → 4.29.5__py3-none-any.whl

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.29.4"
+__version__ = "4.29.5"

seleniumbase/core/browser_launcher.py

@@ -394,9 +394,9 @@ def uc_special_open_if_cf(
                     )
                     uc_metrics = {}
                     if (
-                        isinstance(device_width, int)
-                        and isinstance(device_height, int)
-                        and isinstance(device_pixel_ratio, int)
+                        isinstance(device_width, (int, float))
+                        and isinstance(device_height, (int, float))
+                        and isinstance(device_pixel_ratio, (int, float))
                     ):
                         uc_metrics["width"] = device_width
                         uc_metrics["height"] = device_height
@@ -975,9 +975,24 @@ def uc_gui_click_cf(driver, frame="iframe", retry=False, blind=False):
     )
 
 
-def uc_gui_handle_cf(driver, frame="iframe"):
-    if not _on_a_cf_turnstile_page(driver):
-        return
+def _uc_gui_handle_captcha(
+    driver,
+    frame="iframe",
+    ctype=None,
+):
+    if ctype == "cf_t":
+        if not _on_a_cf_turnstile_page(driver):
+            return
+    elif ctype == "g_rc":
+        if not _on_a_g_recaptcha_page(driver):
+            return
+    else:
+        if _on_a_g_recaptcha_page(driver):
+            ctype = "g_rc"
+        elif _on_a_cf_turnstile_page(driver):
+            ctype = "cf_t"
+        else:
+            return
     install_pyautogui_if_missing(driver)
     import pyautogui
     pyautogui = get_configured_pyautogui(pyautogui)
@@ -988,7 +1003,10 @@ def uc_gui_handle_cf(driver, frame="iframe"):
     with gui_lock:  # Prevent issues with multiple processes
         needs_switch = False
         is_in_frame = js_utils.is_in_frame(driver)
-        if is_in_frame and driver.is_element_present("#challenge-stage"):
+        selector = "#challenge-stage"
+        if ctype == "g_rc":
+            selector = "#recaptcha-token"
+        if is_in_frame and driver.is_element_present(selector):
             driver.switch_to.parent_frame()
             needs_switch = True
             is_in_frame = js_utils.is_in_frame(driver)
@@ -997,67 +1015,77 @@ def uc_gui_handle_cf(driver, frame="iframe"):
             page_actions.switch_to_window(
                 driver, driver.current_window_handle, 2, uc_lock=False
             )
-        if (
-            driver.is_element_present(".cf-turnstile-wrapper iframe")
-            or driver.is_element_present(
-                '[data-callback="onCaptchaSuccess"] iframe'
-            )
-        ):
-            pass
-        else:
-            visible_iframe = False
-            if driver.is_element_present(".cf-turnstile-wrapper"):
-                frame = ".cf-turnstile-wrapper"
-            elif driver.is_element_present(
-                '[data-callback="onCaptchaSuccess"]'
-            ):
-                frame = '[data-callback="onCaptchaSuccess"]'
-            elif (
-                driver.is_element_present('[name*="cf-turnstile-"]')
-                and driver.is_element_present("div.spacer div[style]")
-            ):
-                frame = "div.spacer div[style]"
-            elif (
-                (
-                    driver.is_element_present('[name*="cf-turnstile-"]')
-                    or driver.is_element_present('[id*="cf-turnstile-"]')
-                )
-                and driver.is_element_present(
-                    'form div div[style*="margin"][style*="padding"]'
+        if ctype == "cf_t":
+            if (
+                driver.is_element_present(".cf-turnstile-wrapper iframe")
+                or driver.is_element_present(
+                    '[data-callback="onCaptchaSuccess"] iframe'
                 )
             ):
-                frame = 'form div div[style*="margin"][style*="padding"]'
-            elif (
-                (
+                pass
+            else:
+                visible_iframe = False
+                if driver.is_element_present(".cf-turnstile-wrapper"):
+                    frame = ".cf-turnstile-wrapper"
+                elif driver.is_element_present(
+                    '[data-callback="onCaptchaSuccess"]'
+                ):
+                    frame = '[data-callback="onCaptchaSuccess"]'
+                elif (
                     driver.is_element_present('[name*="cf-turnstile-"]')
-                    or driver.is_element_present('[id*="cf-turnstile-"]')
-                )
-                and driver.is_element_present(
-                    'div > div > [style*="margin"][style*="padding"]'
-                )
+                    and driver.is_element_present("div.spacer div[style]")
+                ):
+                    frame = "div.spacer div[style]"
+                elif (
+                    (
+                        driver.is_element_present('[name*="cf-turnstile-"]')
+                        or driver.is_element_present('[id*="cf-turnstile-"]')
+                    )
+                    and driver.is_element_present(
+                        'form div div[style*="margin"][style*="padding"]'
+                    )
+                ):
+                    frame = 'form div div[style*="margin"][style*="padding"]'
+                elif (
+                    (
+                        driver.is_element_present('[name*="cf-turnstile-"]')
+                        or driver.is_element_present('[id*="cf-turnstile-"]')
+                    )
+                    and driver.is_element_present(
+                        'div > div > [style*="margin"][style*="padding"]'
+                    )
+                ):
+                    frame = 'div > div > [style*="margin"][style*="padding"]'
+                else:
+                    return
+        else:
+            if (
+                driver.is_element_present('iframe[title="reCAPTCHA"]')
+                and frame == "iframe"
             ):
-                frame = 'div > div > [style*="margin"][style*="padding"]'
-            else:
-                return
+                frame = 'iframe[title="reCAPTCHA"]'
         if not is_in_frame or needs_switch:
             # Currently not in frame (or nested frame outside CF one)
             try:
-                if visible_iframe:
+                if visible_iframe or ctype == "g_rc":
                     driver.switch_to_frame(frame)
             except Exception:
-                if visible_iframe:
+                if visible_iframe or ctype == "g_rc":
                     if driver.is_element_present("iframe"):
                         driver.switch_to_frame("iframe")
                     else:
                         return
         try:
+            selector = "div.cf-turnstile"
+            if ctype == "g_rc":
+                selector = "span#recaptcha-anchor"
             found_checkbox = False
             for i in range(24):
                 pyautogui.press("\t")
                 time.sleep(0.02)
                 active_element_css = js_utils.get_active_element_css(driver)
                 if (
-                    active_element_css.startswith("div.cf-turnstile")
+                    active_element_css.startswith(selector)
                     or active_element_css.endswith(" > div" * 2)
                 ):
                     found_checkbox = True
@@ -1081,6 +1109,18 @@ def uc_gui_handle_cf(driver, frame="iframe"):
     driver.reconnect(reconnect_time)
 
 
+def uc_gui_handle_captcha(driver, frame="iframe"):
+    _uc_gui_handle_captcha(driver, frame=frame, ctype=None)
+
+
+def uc_gui_handle_cf(driver, frame="iframe"):
+    _uc_gui_handle_captcha(driver, frame=frame, ctype="cf_t")
+
+
+def uc_gui_handle_rc(driver, frame="iframe"):
+    _uc_gui_handle_captcha(driver, frame=frame, ctype="g_rc")
+
+
 def uc_switch_to_frame(driver, frame="iframe", reconnect_time=None):
     from selenium.webdriver.remote.webelement import WebElement
     if isinstance(frame, WebElement):
@@ -1479,9 +1519,9 @@ def _set_chrome_options(
         emulator_settings = {}
         device_metrics = {}
         if (
-            isinstance(device_width, int)
-            and isinstance(device_height, int)
-            and isinstance(device_pixel_ratio, int)
+            isinstance(device_width, (int, float))
+            and isinstance(device_height, (int, float))
+            and isinstance(device_pixel_ratio, (int, float))
         ):
             device_metrics["width"] = device_width
             device_metrics["height"] = device_height
@@ -3229,9 +3269,9 @@ def get_local_driver(
             emulator_settings = {}
             device_metrics = {}
             if (
-                isinstance(device_width, int)
-                and isinstance(device_height, int)
-                and isinstance(device_pixel_ratio, int)
+                isinstance(device_width, (int, float))
+                and isinstance(device_height, (int, float))
+                and isinstance(device_pixel_ratio, (int, float))
             ):
                 device_metrics["width"] = device_width
                 device_metrics["height"] = device_height
@@ -4421,13 +4461,18 @@ def get_local_driver(
                             driver, *args, **kwargs
                         )
                     )
+                    driver.uc_gui_click_cf = (
+                        lambda *args, **kwargs: uc_gui_click_cf(
+                            driver, *args, **kwargs
+                        )
+                    )
                     driver.uc_gui_click_rc = (
                         lambda *args, **kwargs: uc_gui_click_rc(
                             driver, *args, **kwargs
                         )
                     )
-                    driver.uc_gui_click_cf = (
-                        lambda *args, **kwargs: uc_gui_click_cf(
+                    driver.uc_gui_handle_captcha = (
+                        lambda *args, **kwargs: uc_gui_handle_captcha(
                             driver, *args, **kwargs
                         )
                     )
@@ -4436,6 +4481,11 @@ def get_local_driver(
                             driver, *args, **kwargs
                         )
                     )
+                    driver.uc_gui_handle_rc = (
+                        lambda *args, **kwargs: uc_gui_handle_rc(
+                            driver, *args, **kwargs
+                        )
+                    )
                     driver.uc_switch_to_frame = (
                         lambda *args, **kwargs: uc_switch_to_frame(
                             driver, *args, **kwargs
@@ -4446,9 +4496,9 @@ def get_local_driver(
                     if mobile_emulator:
                         uc_metrics = {}
                         if (
-                            isinstance(device_width, int)
-                            and isinstance(device_height, int)
-                            and isinstance(device_pixel_ratio, int)
+                            isinstance(device_width, (int, float))
+                            and isinstance(device_height, (int, float))
+                            and isinstance(device_pixel_ratio, (int, float))
                         ):
                             uc_metrics["width"] = device_width
                             uc_metrics["height"] = device_height

seleniumbase/fixtures/base_case.py

@@ -4246,12 +4246,16 @@ class BaseCase(unittest.TestCase):
                 self.uc_gui_click_x_y = new_driver.uc_gui_click_x_y
             if hasattr(new_driver, "uc_gui_click_captcha"):
                 self.uc_gui_click_captcha = new_driver.uc_gui_click_captcha
-            if hasattr(new_driver, "uc_gui_click_rc"):
-                self.uc_gui_click_rc = new_driver.uc_gui_click_rc
             if hasattr(new_driver, "uc_gui_click_cf"):
                 self.uc_gui_click_cf = new_driver.uc_gui_click_cf
+            if hasattr(new_driver, "uc_gui_click_rc"):
+                self.uc_gui_click_rc = new_driver.uc_gui_click_rc
+            if hasattr(new_driver, "uc_gui_handle_captcha"):
+                self.uc_gui_handle_captcha = new_driver.uc_gui_handle_captcha
             if hasattr(new_driver, "uc_gui_handle_cf"):
                 self.uc_gui_handle_cf = new_driver.uc_gui_handle_cf
+            if hasattr(new_driver, "uc_gui_handle_rc"):
+                self.uc_gui_handle_rc = new_driver.uc_gui_handle_rc
             if hasattr(new_driver, "uc_switch_to_frame"):
                 self.uc_switch_to_frame = new_driver.uc_switch_to_frame
         return new_driver

{seleniumbase-4.29.4.dist-info → seleniumbase-4.29.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seleniumbase
-Version: 4.29.4
+Version: 4.29.5
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz

{seleniumbase-4.29.4.dist-info → seleniumbase-4.29.5.dist-info}/RECORD

@@ -5,7 +5,7 @@ sbase/steps.py,sha256=bKT_u5bJkKzYWEuAXi9NVVRYYxQRCM1_YJUrNFFRVPY,42865
 seleniumbase/ReadMe.md,sha256=4nEdto4d0Ch0Zneg0yAC-RBBdqRqPUP0SCo-ze_XDPM,3612
 seleniumbase/__init__.py,sha256=dgq30q6wGO2fJOVYemxC5hLxzv-of-MRn5P1YarBq5k,2263
 seleniumbase/__main__.py,sha256=dn1p6dgCchmcH1zzTzzQvFwwdQQqnTGH6ULV9m4hv24,654
-seleniumbase/__version__.py,sha256=9wKpIa05eFqiwqGotD27Kkn8ry6rjgywgbO9xJ12u5M,46
+seleniumbase/__version__.py,sha256=0HczSW_Tdr-OCCeHjw9Q5zGNL9yfcXXCfeTSGL5Xlzo,46
 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=q4uYZixZBf7VYWnQnEk2weTcyMy1X1faR3vyYvUzDiA,56406
@@ -40,7 +40,7 @@ seleniumbase/console_scripts/sb_print.py,sha256=yo641b_OdSE0GUauOyxk-QrNeIjYzbRY
 seleniumbase/console_scripts/sb_recorder.py,sha256=UQQhnAR18dbcC7ToDvj6TM2PIG5qBrNaekaM6kSK_E8,10970
 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=jeGM5-CWht3x4HmGKBcXXesoU2nx5V9yp4gg9d2oL3M,192285
+seleniumbase/core/browser_launcher.py,sha256=RIQnvbJbpH9Ds6931tA16XxT3xXK8RDvFeQQDaYaC_A,194161
 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
@@ -70,7 +70,7 @@ 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=pWWWCBg_L1d0nfuK6g0rtlf232CvolEdUomxhmylG6A,701612
+seleniumbase/fixtures/base_case.py,sha256=mgtLtLFrO9L0916qgYWYj0Fr7i7srtauGJfiFi-Yq3g,701875
 seleniumbase/fixtures/constants.py,sha256=TapuGLdERtvZPGMblVXkNGybr8tj8FMtN3sbJ3ygyoc,13569
 seleniumbase/fixtures/css_to_xpath.py,sha256=9ouDB1xl4MJ2os6JOgTIAyHKOQfuxtxvXC3O5hSnEKA,1954
 seleniumbase/fixtures/errors.py,sha256=KyxuEVx_e3MPhVrJfNIa_3ltMpbCFxfy_jxK8RFNTns,555
@@ -137,9 +137,9 @@ seleniumbase/utilities/selenium_grid/start-grid-hub.sh,sha256=KADv0RUHONLL2_I443
 seleniumbase/utilities/selenium_ide/ReadMe.md,sha256=hznGeuMpkIimqMiZBW-4goIy2ltW4l8X9kb0YSPUQfE,4483
 seleniumbase/utilities/selenium_ide/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 seleniumbase/utilities/selenium_ide/convert_ide.py,sha256=pZFnqEJQEKZPyNFjkLD29s2HPQgCrWW9XJWpCPhWOoM,31691
-seleniumbase-4.29.4.dist-info/LICENSE,sha256=odSYtWibXBnQ1gBg6CnDZ82n8kLF_if5-2nbqnEyD8k,1085
-seleniumbase-4.29.4.dist-info/METADATA,sha256=XuKfOEiIF6mZwk5uDxr6GtSgJDnpsKEqIIjzb14-YoM,85695
-seleniumbase-4.29.4.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-seleniumbase-4.29.4.dist-info/entry_points.txt,sha256=CNrh2EKNaHYEhO6pP1RJyVLB99LkDDYX7TnUK8xfjqk,623
-seleniumbase-4.29.4.dist-info/top_level.txt,sha256=4N97aBOQ8ETCnDnokBsWb07lJfTaq3C1ZzYRxvLMxqU,19
-seleniumbase-4.29.4.dist-info/RECORD,,
+seleniumbase-4.29.5.dist-info/LICENSE,sha256=odSYtWibXBnQ1gBg6CnDZ82n8kLF_if5-2nbqnEyD8k,1085
+seleniumbase-4.29.5.dist-info/METADATA,sha256=9KDnfWkf548uf1KzVll5zqW7aAQF2ApHMAYV7kLG5qQ,85695
+seleniumbase-4.29.5.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+seleniumbase-4.29.5.dist-info/entry_points.txt,sha256=CNrh2EKNaHYEhO6pP1RJyVLB99LkDDYX7TnUK8xfjqk,623
+seleniumbase-4.29.5.dist-info/top_level.txt,sha256=4N97aBOQ8ETCnDnokBsWb07lJfTaq3C1ZzYRxvLMxqU,19
+seleniumbase-4.29.5.dist-info/RECORD,,