seleniumbase 4.30.0__py3-none-any.whl → 4.30.2__py3-none-any.whl

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.30.0"
+__version__ = "4.30.2"

seleniumbase/console_scripts/ReadMe.md

@@ -350,9 +350,10 @@ sbase mkfile new_test.py
 
 * Options:
 
+``--uc``  (UC Mode boilerplate using SB context manager)
 `-b` / `--basic`  (Basic boilerplate / single-line test)
-`-r` / `--rec`  (adds Pdb+ breakpoint for Recorder Mode)
-``--url=URL``  (makes the test start on a specific page)
+`-r` / `--rec`  (Adds Pdb+ breakpoint for Recorder Mode)
+``--url=URL``  (Makes the test start on a specific page)
 
 * Language Options:
 
@@ -381,6 +382,7 @@ methods: "open", "type", "click", "assert_element",
 and "assert_text". If using the basic boilerplate
 option, only the "open" method is included. Only the
 BaseCase format supports Languages or Recorder Mode.
+UC Mode automatically uses English with SB() format.
 
 <h3>mkrec / record / codegen</h3>
 

seleniumbase/console_scripts/run.py

@@ -264,9 +264,10 @@ def show_mkfile_usage():
     print("  Example:")
     print("           sbase mkfile new_test.py")
     print("  Options:")
+    print("           --uc  (UC Mode boilerplate using SB context manager)")
     print("           -b / --basic  (Basic boilerplate / single-line test)")
-    print("           -r / --rec  (adds Pdb+ breakpoint for Recorder Mode)")
-    print("           --url=URL  (makes the test start on a specific page)")
+    print("           -r / --rec  (Adds Pdb+ breakpoint for Recorder Mode)")
+    print("           --url=URL  (Makes the test start on a specific page)")
     print("  Language Options:")
     print("           --en / --English    |    --zh / --Chinese")
     print("           --nl / --Dutch      |    --fr / --French")
@@ -289,6 +290,7 @@ def show_mkfile_usage():
     print('           and "assert_text". If using the basic boilerplate')
     print('           option, only the "open" method is included. Only the')
     print("           BaseCase format supports Languages or Recorder Mode.")
+    print("           UC Mode automatically uses English with SB() format.")
     print("")
 
 

seleniumbase/console_scripts/sb_mkfile.py

@@ -9,9 +9,10 @@ Example:
     sbase mkfile new_test.py
 
 Options:
+    --uc  (UC Mode boilerplate using SB context manager)
     -b / --basic  (Basic boilerplate / single-line test)
-    -r / --rec  (adds Pdb+ breakpoint for Recorder Mode)
-    --url=URL  (makes the test start on a specific page)
+    -r / --rec  (Adds Pdb+ breakpoint for Recorder Mode)
+    --url=URL  (Makes the test start on a specific page)
 
 Language Options:
     --en / --English    |    --zh / --Chinese
@@ -37,6 +38,7 @@ Output:
     and "assert_text". If using the basic boilerplate
     option, only the "open" method is included. Only the
     BaseCase format supports Languages or Recorder Mode.
+    UC Mode automatically uses English with SB() format.
 """
 import codecs
 import colorama
@@ -52,9 +54,10 @@ def invalid_run_command(msg=None):
     exp += "  Example:\n"
     exp += "           sbase mkfile new_test.py\n"
     exp += "  Options:\n"
+    exp += "           --uc  (UC Mode boilerplate using SB context manager)\n"
     exp += "           -b / --basic  (Basic boilerplate / single-line test)\n"
-    exp += "           -r / --rec  (adds Pdb+ breakpoint for Recorder Mode)\n"
-    exp += "           --url=URL  (makes the test start on a specific page)\n"
+    exp += "           -r / --rec  (Adds Pdb+ breakpoint for Recorder Mode)\n"
+    exp += "           --url=URL  (Makes the test start on a specific page)\n"
     exp += "  Language Options:\n"
     exp += "           --en / --English    |    --zh / --Chinese\n"
     exp += "           --nl / --Dutch      |    --fr / --French\n"
@@ -77,6 +80,7 @@ def invalid_run_command(msg=None):
     exp += '           and "assert_text". If using the basic boilerplate\n'
     exp += '           option, only the "open" method is included. Only the\n'
     exp += "           BaseCase format supports Languages or Recorder Mode.\n"
+    exp += "           UC Mode automatically uses English with SB() format.\n"
     if not msg:
         raise Exception("INVALID RUN COMMAND!\n\n%s" % exp)
     elif msg == "help":
@@ -105,6 +109,7 @@ def main():
         cr = colorama.Style.RESET_ALL
 
     basic = False
+    use_uc = False
     help_me = False
     recorder = False
     error_msg = None
@@ -152,6 +157,9 @@ def main():
                 recorder = True
             elif option == "--record" or option == "--recorder":
                 recorder = True
+            elif use_uc:
+                # UC must use English & ContextManager formats
+                continue
             elif option == "--en" or option == "--english":
                 language = "English"
             elif option == "--zh" or option == "--chinese":
@@ -184,6 +192,11 @@ def main():
                 syntax = "DriverContext"
             elif option == "--dm" or option == "--driver-manager":
                 syntax = "DriverManager"
+            elif option == "--uc":
+                basic = True
+                language = "English"
+                syntax = "ContextManager"
+                use_uc = True
             else:
                 invalid_cmd = "\n===> INVALID OPTION: >> %s <<\n" % option
                 invalid_cmd = invalid_cmd.replace(">> ", ">>" + c5 + " ")
@@ -319,16 +332,22 @@ def main():
         data = []
         data.append("from seleniumbase import SB")
         data.append("")
-        data.append('with SB(browser="chrome") as sb:')
-        data.append(
-            '    sb.open("data:text/html,<div>Hello<br><input></div>")'
-        )
+        if use_uc:
+            data.append('with SB(uc=True) as sb:')
+        else:
+            data.append('with SB(browser="chrome") as sb:')
+        if use_uc:
+            data.append('    url = "%s"' % url)
+            data.append("    sb.uc_open_with_reconnect(url, 4)")
+            data.append("    sb.uc_gui_click_captcha()")
+        else:
+            data.append('    sb.open("%s")' % url)
         if not basic:
             data.append('    sb.type("input", "Goodbye")  # selector, text')
-            data.append('    sb.click("html body > div")  # selector')
+            data.append('    sb.click("html body > p")  # selector')
             data.append('    sb.assert_element("input")  # selector')
-            data.append('    sb.assert_text("Hello", "div")  # text, selector')
-            data.append('    sb.highlight("div")  # selector')
+            data.append('    sb.assert_text("Hello", "p")  # text, selector')
+            data.append('    sb.highlight("p")  # selector')
             data.append("    sb.sleep(0.5)  # seconds")
         data.append("")
         new_data = data
@@ -337,7 +356,14 @@ def main():
         data.append("from seleniumbase import DriverContext")
         data.append("")
         data.append('with DriverContext(browser="chrome") as driver:')
-        data.append('    driver.get("data:text/html,<p>Hello<br><input>")')
+        data.append('    driver.get("%s")' % url)
+        if not basic:
+            data.append('    driver.type("input", "Goodbye")  # sel, text')
+            data.append('    driver.click("html body > p")  # selector')
+            data.append('    driver.assert_element("input")  # selector')
+            data.append('    driver.assert_text("Hello", "p")  # text, sel')
+            data.append('    driver.highlight("p")  # selector')
+            data.append("    driver.sleep(0.5)  # seconds")
         data.append("")
         new_data = data
     elif language == "English" and syntax == "DriverManager":
@@ -346,7 +372,14 @@ def main():
         data.append("")
         data.append('driver = Driver(browser="chrome")')
         data.append("try:")
-        data.append('    driver.get("data:text/html,<p>Hello<br><input>")')
+        data.append('    driver.get("%s")' % url)
+        if not basic:
+            data.append('    driver.type("input", "Goodbye")  # sel, text')
+            data.append('    driver.click("html body > p")  # selector')
+            data.append('    driver.assert_element("input")  # selector')
+            data.append('    driver.assert_text("Hello", "p")  # text, sel')
+            data.append('    driver.highlight("p")  # selector')
+            data.append("    driver.sleep(0.5)  # seconds")
         data.append("finally:")
         data.append("    driver.quit()")
         data.append("")

seleniumbase/core/browser_launcher.py

@@ -340,17 +340,19 @@ def find_edgedriver_version_to_use(use_version, driver_version):
     return use_version
 
 
-def has_cf(text):
+def has_captcha(text):
     if (
         "<title>403 Forbidden</title>" in text
         or "Permission Denied</title>" in text
         or 'id="challenge-error-text"' in text
         or "<title>Just a moment..." in text
         or 'action="/?__cf_chl_f_tk' in text
+        or 'id="challenge-widget-' in text
         or 'src="chromedriver.js"' in text
         or 'class="g-recaptcha"' in text
         or 'content="Pixelscan"' in text
         or 'id="challenge-form"' in text
+        or "/challenge-platform" in text
         or "window._cf_chl_opt" in text
         or "/recaptcha/api.js" in text
         or "/turnstile/" in text
@@ -377,7 +379,7 @@ def uc_special_open_if_cf(
                 status_str.startswith("3")
                 or status_str.startswith("4")
                 or status_str.startswith("5")
-                or has_cf(req_get.text)
+                or has_captcha(req_get.text)
             ):
                 special = True
                 if status_str == "403" or status_str == "429":
@@ -763,6 +765,8 @@ def _on_a_cf_turnstile_page(driver):
     source = driver.get_page_source()
     if (
         'data-callback="onCaptchaSuccess"' in source
+        or "/challenge-platform/scripts/" in source
+        or 'id="challenge-widget-' in source
         or "cf-turnstile-" in source
     ):
         return True
@@ -863,9 +867,16 @@ def _uc_gui_click_captcha(
                     frame = "%s div[style]" % frame
                 elif (
                     driver.is_element_present('[name*="cf-turnstile-"]')
-                    and driver.is_element_present("div.spacer div[style]")
+                    and driver.is_element_present("div.spacer div")
                 ):
-                    frame = "div.spacer div[style]"
+                    frame = "div.spacer div"
+                elif (
+                    driver.is_element_present('script[src*="challenges.c"]')
+                    and driver.is_element_present(
+                        '[data-testid*="challenge-"] div'
+                    )
+                ):
+                    frame = '[data-testid*="challenge-"] div'
                 elif (
                     (
                         driver.is_element_present('[name*="cf-turnstile-"]')
@@ -883,6 +894,14 @@ def _uc_gui_click_captcha(
                     )
                 ):
                     frame = "%s .cf-turnstile-wrapper" % frame
+                elif (
+                    frame != "iframe"
+                    and driver.is_element_present(
+                        '%s [name*="cf-turnstile"]' % frame
+                    )
+                    and driver.is_element_present("%s div" % frame)
+                ):
+                    frame = "%s div" % frame
                 elif driver.is_element_present(".cf-turnstile-wrapper"):
                     frame = ".cf-turnstile-wrapper"
                 elif driver.is_element_present(
@@ -1099,9 +1118,16 @@ def _uc_gui_handle_captcha(
                     frame = '[data-callback="onCaptchaSuccess"]'
                 elif (
                     driver.is_element_present('[name*="cf-turnstile-"]')
-                    and driver.is_element_present("div.spacer div[style]")
+                    and driver.is_element_present("div.spacer div")
+                ):
+                    frame = "div.spacer div"
+                elif (
+                    driver.is_element_present('script[src*="challenges.c"]')
+                    and driver.is_element_present(
+                        '[data-testid*="challenge-"] div'
+                    )
                 ):
-                    frame = "div.spacer div[style]"
+                    frame = '[data-testid*="challenge-"] div'
                 elif (
                     (
                         driver.is_element_present('[name*="cf-turnstile-"]')

{seleniumbase-4.30.0.dist-info → seleniumbase-4.30.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seleniumbase
-Version: 4.30.0
+Version: 4.30.2
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -59,7 +59,7 @@ Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: attrs >=24.2.0
-Requires-Dist: certifi >=2024.7.4
+Requires-Dist: certifi >=2024.8.30
 Requires-Dist: exceptiongroup >=1.2.2
 Requires-Dist: parse >=1.20.2
 Requires-Dist: parse-type >=0.6.3
@@ -161,7 +161,7 @@ Requires-Dist: cffi ==1.15.1 ; (python_version < "3.8") and extra == 'pdfminer'
 Requires-Dist: cryptography ==39.0.2 ; (python_version < "3.9") and extra == 'pdfminer'
 Requires-Dist: pdfminer.six ==20240706 ; (python_version >= "3.8") and extra == 'pdfminer'
 Requires-Dist: cffi ==1.17.0 ; (python_version >= "3.8") and extra == 'pdfminer'
-Requires-Dist: cryptography ==43.0.0 ; (python_version >= "3.9") and extra == 'pdfminer'
+Requires-Dist: cryptography ==43.0.1 ; (python_version >= "3.9") and extra == 'pdfminer'
 Provides-Extra: pillow
 Requires-Dist: Pillow ==9.5.0 ; (python_version < "3.8") and extra == 'pillow'
 Requires-Dist: Pillow >=10.4.0 ; (python_version >= "3.8") and extra == 'pillow'

{seleniumbase-4.30.0.dist-info → seleniumbase-4.30.2.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=2LQZxA2MHN0gDWi7lH0LnKGsK_Dk0DOG8QJwGK7SeMk,46
+seleniumbase/__version__.py,sha256=BdkAfSbnD0GdQ2ws-16m3-ETEGErOpRmMIK6vKT_YUs,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
@@ -21,18 +21,18 @@ seleniumbase/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 seleniumbase/config/ad_block_list.py,sha256=qCQvbpONdSXk6q5tMwLuOswGYE1Syd8cy5TMIYFjTME,3380
 seleniumbase/config/proxy_list.py,sha256=tSdk82_6pPqClotHMl3YOTlxi9IIEppHmCoQDkZXLqw,1123
 seleniumbase/config/settings.py,sha256=n07U3PrrTgXgg5S1DIGnRuR6Y7AW11y06lvkflD7ZuE,7708
-seleniumbase/console_scripts/ReadMe.md,sha256=WQiuXXpsyoKePkkt3aq7XMWr7KBZq7Wk4n2iee-2Ihk,20210
+seleniumbase/console_scripts/ReadMe.md,sha256=t2AWWINwkPgnx8HUM3vQRtdFRwBS2XLGxYnmTipeheE,20320
 seleniumbase/console_scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 seleniumbase/console_scripts/logo_helper.py,sha256=F8pcANlWY6pdcMwHUdjjpjAD9i8XD0R5J-28eSh7QMM,1907
 seleniumbase/console_scripts/rich_helper.py,sha256=U_zvXpalxVV8rtg8c8EnNNmnh45tii3AV5ZV3O3KbGA,2234
-seleniumbase/console_scripts/run.py,sha256=54XCmUvOtYT5UmajEZ208wflH5BLkEpHZSmvgaJFSN0,59173
+seleniumbase/console_scripts/run.py,sha256=H7sWc5Bni_RTk4rWqiLZ6b1lhHnKjfVZjy1xYehl2YE,59327
 seleniumbase/console_scripts/sb_behave_gui.py,sha256=8uFTnHU3lPsxAlPFbGe4tH4fVryEbQeVBydwJZw3e9c,15403
 seleniumbase/console_scripts/sb_caseplans.py,sha256=HrML5SU6E_3gC8Ae5byo5tnBidrs0sY3feJ8ug4cR4o,18415
 seleniumbase/console_scripts/sb_commander.py,sha256=FdRLcEe3xOnnbU1bZI4_1ZLu5eKdR4JuIh37j5M-J00,13585
 seleniumbase/console_scripts/sb_install.py,sha256=SZlJyN51SzQVR7WKquJtukOo3_h2mK00UMTkb0HEciQ,45682
 seleniumbase/console_scripts/sb_mkchart.py,sha256=QDDjA8N_Qy62Mgbe2fnSU8mhZbKTVyV9KJRKYz2Tf7Y,11232
 seleniumbase/console_scripts/sb_mkdir.py,sha256=-OJrGM3upjdhCQb00zxSapS7eVtE49K3bR6KzsGvBbM,30049
-seleniumbase/console_scripts/sb_mkfile.py,sha256=t2rxTZTz76RDeSbBdHLaHUDS6LT_p0ttm2H_uYdtBko,16480
+seleniumbase/console_scripts/sb_mkfile.py,sha256=mZCUl318UkLvW5v1C40Tx19q6_aVJOfTZoKfd3XcakU,18132
 seleniumbase/console_scripts/sb_mkpres.py,sha256=5MEYFKATmh68wy0SRi2NQtO71MN7m-rQq-WtUp4cKD8,11306
 seleniumbase/console_scripts/sb_mkrec.py,sha256=AKAbVnkI5nLDpA6W9JZu38QSpJz5IE8Pto-Em9U5r2o,11208
 seleniumbase/console_scripts/sb_objectify.py,sha256=SRYY_cZ-Ip6Lj65T2maXRyJctOWAFhGSc-Xlc-u-2CM,122140
@@ -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=_Oms_vw4OHofMFyXxKDDX_PD1sdabHGdIrebGHUoC9s,197939
+seleniumbase/core/browser_launcher.py,sha256=S5caztJN0Al8eRFbsTAKQIugD8PpCQnMhvQIqqpO1j8,199052
 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
@@ -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.30.0.dist-info/LICENSE,sha256=odSYtWibXBnQ1gBg6CnDZ82n8kLF_if5-2nbqnEyD8k,1085
-seleniumbase-4.30.0.dist-info/METADATA,sha256=hsLLWlsN-hlsjf54EJrA6B--5AULFyGjLblKoehSZ6Q,86174
-seleniumbase-4.30.0.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-seleniumbase-4.30.0.dist-info/entry_points.txt,sha256=CNrh2EKNaHYEhO6pP1RJyVLB99LkDDYX7TnUK8xfjqk,623
-seleniumbase-4.30.0.dist-info/top_level.txt,sha256=4N97aBOQ8ETCnDnokBsWb07lJfTaq3C1ZzYRxvLMxqU,19
-seleniumbase-4.30.0.dist-info/RECORD,,
+seleniumbase-4.30.2.dist-info/LICENSE,sha256=odSYtWibXBnQ1gBg6CnDZ82n8kLF_if5-2nbqnEyD8k,1085
+seleniumbase-4.30.2.dist-info/METADATA,sha256=Zj_V_pSG-9cEhphk9j0wA0vP40xi-Fol8V40UMyTV0M,86175
+seleniumbase-4.30.2.dist-info/WHEEL,sha256=uCRv0ZEik_232NlR4YDw4Pv3Ajt5bKvMH13NUU7hFuI,91
+seleniumbase-4.30.2.dist-info/entry_points.txt,sha256=CNrh2EKNaHYEhO6pP1RJyVLB99LkDDYX7TnUK8xfjqk,623
+seleniumbase-4.30.2.dist-info/top_level.txt,sha256=4N97aBOQ8ETCnDnokBsWb07lJfTaq3C1ZzYRxvLMxqU,19
+seleniumbase-4.30.2.dist-info/RECORD,,

{seleniumbase-4.30.0.dist-info → seleniumbase-4.30.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.0.0)
+Generator: setuptools (74.1.1)
 Root-Is-Purelib: true
 Tag: py3-none-any