seleniumbase 4.24.11__py3-none-any.whl → 4.33.15__py3-none-any.whl

seleniumbase/core/log_helper.py

@@ -3,9 +3,11 @@ import os
 import shutil
 import sys
 import time
+from contextlib import suppress
 from seleniumbase import config as sb_config
 from seleniumbase.config import settings
 from seleniumbase.fixtures import constants
+from seleniumbase.fixtures import shared_utils
 
 python3_11_or_newer = False
 if sys.version_info >= (3, 11):
@@ -13,6 +15,11 @@ if sys.version_info >= (3, 11):
 py311_patch2 = constants.PatchPy311.PATCH
 
 
+def __is_cdp_swap_needed(driver):
+    """If the driver is disconnected, use a CDP method when available."""
+    return shared_utils.is_cdp_swap_needed(driver)
+
+
 def log_screenshot(test_logpath, driver, screenshot=None, get=False):
     screenshot_name = settings.SCREENSHOT_NAME
     screenshot_path = os.path.join(test_logpath, screenshot_name)
@@ -32,6 +39,8 @@ def log_screenshot(test_logpath, driver, screenshot=None, get=False):
         if screenshot != screenshot_warning:
             with open(screenshot_path, "wb") as file:
                 file.write(screenshot)
+            with suppress(Exception):
+                shared_utils.make_writable(screenshot_path)
         else:
             print("WARNING: %s" % screenshot_warning)
         if get:
@@ -281,14 +290,14 @@ def log_test_failure_data(test, test_logpath, driver, browser, url=None):
         sb_config._report_time = the_time
         sb_config._report_traceback = traceback_message
         sb_config._report_exception = exc_message
-    try:
-        if not os.path.exists(test_logpath):
+    if not os.path.exists(test_logpath):
+        with suppress(Exception):
             os.makedirs(test_logpath)
-    except Exception:
-        pass
-    log_file = codecs.open(basic_file_path, "w+", "utf-8")
-    log_file.writelines("\r\n".join(data_to_save))
-    log_file.close()
+    with suppress(Exception):
+        log_file = codecs.open(basic_file_path, "w+", encoding="utf-8")
+        log_file.writelines("\r\n".join(data_to_save))
+        log_file.close()
+        shared_utils.make_writable(basic_file_path)
 
 
 def log_skipped_test_data(test, test_logpath, driver, browser, reason):
@@ -297,16 +306,12 @@ def log_skipped_test_data(test, test_logpath, driver, browser, reason):
     browser_version = None
     driver_version = None
     driver_name = None
-    try:
+    with suppress(Exception):
         browser_version = get_browser_version(driver)
-    except Exception:
-        pass
-    try:
+    with suppress(Exception):
         driver_name, driver_version = get_driver_name_and_version(
             driver, browser
         )
-    except Exception:
-        pass
     if browser_version:
         headless = ""
         if test.headless and browser in ["chrome", "edge", "firefox"]:
@@ -343,9 +348,11 @@ def log_skipped_test_data(test, test_logpath, driver, browser, reason):
     data_to_save.append(" * Skip Reason: %s" % reason)
     data_to_save.append("")
     file_path = os.path.join(test_logpath, "skip_reason.txt")
-    log_file = codecs.open(file_path, "w+", encoding="utf-8")
-    log_file.writelines("\r\n".join(data_to_save))
-    log_file.close()
+    with suppress(Exception):
+        log_file = codecs.open(file_path, "w+", encoding="utf-8")
+        log_file.writelines("\r\n".join(data_to_save))
+        log_file.close()
+        shared_utils.make_writable(file_path)
 
 
 def log_page_source(test_logpath, driver, source=None):
@@ -354,7 +361,11 @@ def log_page_source(test_logpath, driver, source=None):
         page_source = source
     else:
         try:
-            page_source = driver.page_source
+            page_source = None
+            if __is_cdp_swap_needed(driver):
+                page_source = driver.cdp.get_page_source()
+            else:
+                page_source = driver.page_source
             page_source = get_html_source_with_base_href(driver, page_source)
         except Exception:
             source = constants.Warnings.PAGE_SOURCE_UNDEFINED
@@ -368,15 +379,15 @@ def log_page_source(test_logpath, driver, source=None):
                 "unresponsive, or closed prematurely!</h4>"
             )
         )
-    try:
-        if not os.path.exists(test_logpath):
+    if not os.path.exists(test_logpath):
+        with suppress(Exception):
             os.makedirs(test_logpath)
-    except Exception:
-        pass
     html_file_path = os.path.join(test_logpath, html_file_name)
-    html_file = codecs.open(html_file_path, "w+", "utf-8")
-    html_file.write(page_source)
-    html_file.close()
+    with suppress(Exception):
+        html_file = codecs.open(html_file_path, "w+", encoding="utf-8")
+        html_file.write(page_source)
+        html_file.close()
+        shared_utils.make_writable(html_file_path)
 
 
 def get_test_id(test):
@@ -446,7 +457,11 @@ def get_test_name(test):
 
 def get_last_page(driver):
     try:
-        last_page = driver.current_url
+        last_page = None
+        if __is_cdp_swap_needed(driver):
+            last_page = driver.cdp.get_current_url()
+        else:
+            last_page = driver.current_url
     except Exception:
         last_page = "[WARNING! Browser Not Open!]"
     if len(last_page) < 5:
@@ -543,7 +558,7 @@ def log_folder_setup(log_path, archive_logs=False):
         try:
             os.makedirs(log_path)
         except Exception:
-            pass  # Should only be reachable during multi-threaded runs
+            pass  # Only reachable during multi-threaded runs
     else:
         saved_folder = "%s/../%s/" % (log_path, constants.Logs.SAVED)
         archived_folder = os.path.realpath(saved_folder) + "/"
@@ -551,7 +566,7 @@ def log_folder_setup(log_path, archive_logs=False):
             try:
                 os.makedirs(archived_folder)
             except Exception:
-                pass  # Should only be reachable during multi-threaded runs
+                pass  # Only reachable during multi-threaded runs
         archived_logs = "%slogs_%s" % (archived_folder, int(time.time()))
         if len(os.listdir(log_path)) > 0:
             try:

seleniumbase/core/mysql.py

@@ -35,10 +35,7 @@ class DatabaseManager:
                 import cryptography  # noqa: F401
                 import pymysql
             except Exception:
-                if sys.version_info < (3, 7):
-                    shared_utils.pip_install("PyMySQL[rsa]", version="1.0.2")
-                else:
-                    shared_utils.pip_install("PyMySQL[rsa]", version="1.1.0")
+                shared_utils.pip_install("PyMySQL[rsa]", version="1.1.1")
                 import pymysql
         db_server = settings.DB_HOST
         db_port = settings.DB_PORT

seleniumbase/core/proxy_helper.py

@@ -2,10 +2,12 @@ import os
 import re
 import warnings
 import zipfile
+from contextlib import suppress
 from seleniumbase.config import proxy_list
 from seleniumbase.config import settings
 from seleniumbase.fixtures import constants
 from seleniumbase.fixtures import page_utils
+from seleniumbase.fixtures import shared_utils
 
 DOWNLOADS_DIR = constants.Files.DOWNLOADS_FOLDER
 PROXY_ZIP_PATH = os.path.join(DOWNLOADS_DIR, "proxy.zip")
@@ -109,31 +111,35 @@ def create_proxy_ext(
         """"minimum_chrome_version":"22.0.0"\n"""
         """}"""
     )
-    import threading
-
-    lock = threading.RLock()  # Support multi-threaded tests. Eg. "pytest -n=4"
-    with lock:
-        abs_path = os.path.abspath(".")
-        downloads_path = os.path.join(abs_path, DOWNLOADS_DIR)
-        if not os.path.exists(downloads_path):
-            os.mkdir(downloads_path)
-        if zip_it:
-            zf = zipfile.ZipFile(PROXY_ZIP_PATH, mode="w")
-            zf.writestr("background.js", background_js)
-            zf.writestr("manifest.json", manifest_json)
-            zf.close()
-        else:
-            proxy_ext_dir = PROXY_DIR_PATH
-            if not os.path.exists(proxy_ext_dir):
-                os.mkdir(proxy_ext_dir)
-            manifest_file = os.path.join(proxy_ext_dir, "manifest.json")
-            with open(manifest_file, mode="w") as f:
-                f.write(manifest_json)
-            proxy_host = proxy_string.split(":")[0]
-            proxy_port = proxy_string.split(":")[1]
-            background_file = os.path.join(proxy_ext_dir, "background.js")
-            with open(background_file, mode="w") as f:
-                f.write(background_js)
+    abs_path = os.path.abspath(".")
+    downloads_path = os.path.join(abs_path, DOWNLOADS_DIR)
+    if not os.path.exists(downloads_path):
+        os.mkdir(downloads_path)
+    if zip_it:
+        zf = zipfile.ZipFile(PROXY_ZIP_PATH, mode="w")
+        zf.writestr("background.js", background_js)
+        zf.writestr("manifest.json", manifest_json)
+        zf.close()
+        with suppress(Exception):
+            shared_utils.make_writable(PROXY_ZIP_PATH)
+    else:
+        proxy_ext_dir = PROXY_DIR_PATH
+        if not os.path.exists(proxy_ext_dir):
+            os.mkdir(proxy_ext_dir)
+        with suppress(Exception):
+            shared_utils.make_writable(proxy_ext_dir)
+        manifest_file = os.path.join(proxy_ext_dir, "manifest.json")
+        with open(manifest_file, mode="w") as f:
+            f.write(manifest_json)
+        with suppress(Exception):
+            shared_utils.make_writable(manifest_json)
+        proxy_host = proxy_string.split(":")[0]
+        proxy_port = proxy_string.split(":")[1]
+        background_file = os.path.join(proxy_ext_dir, "background.js")
+        with open(background_file, mode="w") as f:
+            f.write(background_js)
+        with suppress(Exception):
+            shared_utils.make_writable(background_js)
 
 
 def remove_proxy_zip_if_present():
@@ -141,13 +147,12 @@ def remove_proxy_zip_if_present():
     Used in the implementation of https://stackoverflow.com/a/35293284
     for https://stackoverflow.com/questions/12848327/
     """
-    try:
-        if os.path.exists(PROXY_ZIP_PATH):
+    if os.path.exists(PROXY_ZIP_PATH):
+        with suppress(Exception):
             os.remove(PROXY_ZIP_PATH)
-        if os.path.exists(PROXY_ZIP_LOCK):
+    if os.path.exists(PROXY_ZIP_LOCK):
+        with suppress(Exception):
             os.remove(PROXY_ZIP_LOCK)
-    except Exception:
-        pass
 
 
 def validate_proxy_string(proxy_string):

seleniumbase/core/recorder_helper.py

@@ -422,9 +422,14 @@ def generate_sbase_code(srt_actions):
         ):
             import unicodedata
 
-            action[1][0] = unicodedata.normalize("NFKC", action[1][0])
-            action[1][0] = action[1][0].replace("\n", "\\n")
-            action[1][0] = action[1][0].replace("\u00B6", "")
+            text_list = False
+            try:
+                action[1][0] = unicodedata.normalize("NFKC", action[1][0])
+                action[1][0] = action[1][0].replace("\n", "\\n")
+                action[1][0] = action[1][0].replace("\u00B6", "")
+            except Exception:
+                text_list = True
+
             method = "assert_text"
             if action[0] == "as_et":
                 method = "assert_exact_text"
@@ -437,7 +442,17 @@ def generate_sbase_code(srt_actions):
             elif action[0] == "da_et":
                 method = "deferred_assert_exact_text"
             if action[1][1] != "html":
-                if '"' not in action[1][0] and '"' not in action[1][1]:
+                if text_list and '"' not in action[1][1]:
+                    sb_actions.append(
+                        'self.%s(%s, "%s")'
+                        % (method, action[1][0], action[1][1])
+                    )
+                elif text_list and "'" not in action[1][1]:
+                    sb_actions.append(
+                        "self.%s(%s, '%s')"
+                        % (method, action[1][0], action[1][1])
+                    )
+                elif '"' not in action[1][0] and '"' not in action[1][1]:
                     sb_actions.append(
                         'self.%s("%s", "%s")'
                         % (method, action[1][0], action[1][1])
@@ -458,7 +473,11 @@ def generate_sbase_code(srt_actions):
                         % (method, action[1][0], action[1][1])
                     )
             else:
-                if '"' not in action[1][0]:
+                if text_list:
+                    sb_actions.append(
+                        'self.%s(%s)' % (method, action[1][0])
+                    )
+                elif '"' not in action[1][0]:
                     sb_actions.append(
                         'self.%s("%s")' % (method, action[1][0])
                     )