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

seleniumbase/core/detect_b_ver.py

@@ -360,18 +360,19 @@ def comet_on_windows_path(browser_type=None):
     for item in map(
         os.environ.get,
         (
+            "LOCALAPPDATA",
             "PROGRAMFILES",
             "PROGRAMFILES(X86)",
-            "LOCALAPPDATA",
             "PROGRAMW6432",
         ),
     ):
         for subitem in (
+            "Perplexity/Comet/Application",
             "Comet/Application",
             "Programs/Comet",
         ):
             try:
-                candidates.append(os.sep.join((item, subitem, "Comet.exe")))
+                candidates.append(os.sep.join((item, subitem, "comet.exe")))
             except TypeError:
                 pass
     for candidate in candidates:
@@ -389,18 +390,19 @@ def atlas_on_windows_path(browser_type=None):
     for item in map(
         os.environ.get,
         (
+            "LOCALAPPDATA",
             "PROGRAMFILES",
             "PROGRAMFILES(X86)",
-            "LOCALAPPDATA",
             "PROGRAMW6432",
         ),
     ):
         for subitem in (
+            "OpenAI/Atlas/Application",
             "Atlas/Application",
             "Programs/Atlas",
         ):
             try:
-                candidates.append(os.sep.join((item, subitem, "Atlas.exe")))
+                candidates.append(os.sep.join((item, subitem, "atlas.exe")))
             except TypeError:
                 pass
     for candidate in candidates:
@@ -460,8 +462,8 @@ def get_binary_location(browser_type, chromium_ok=False):
         },
         ChromeType.ATLAS: {
             OSType.LINUX: atlas_on_linux_path(browser_type),
-            OSType.MAC: r"/Applications/Atlas.app"
-                        r"/Contents/MacOS/Atlas",
+            OSType.MAC: r"/Applications/ChatGPT Atlas.app"
+                        r"/Contents/MacOS/ChatGPT Atlas",
             OSType.WIN: atlas_on_windows_path(browser_type),
         },
     }

seleniumbase/core/log_helper.py

@@ -25,7 +25,7 @@ def log_screenshot(test_logpath, driver, screenshot=None, get=False):
     screenshot_skipped = constants.Warnings.SCREENSHOT_SKIPPED
     screenshot_warning = constants.Warnings.SCREENSHOT_UNDEFINED
     if (
-        (hasattr(sb_config, "no_screenshot") and sb_config.no_screenshot)
+        getattr(sb_config, "no_screenshot", None)
         or screenshot == screenshot_skipped
     ):
         if get:
@@ -186,14 +186,10 @@ def log_test_failure_data(test, test_logpath, driver, browser, url=None):
     data_to_save.append(
         "--------------------------------------------------------------------"
     )
-    if (
-        hasattr(test, "_outcome")
-        and hasattr(test._outcome, "errors")
-        and test._outcome.errors
-    ):
+    if hasattr(test, "_outcome") and getattr(test._outcome, "errors", None):
         try:
-            exc_message = test._outcome.errors[0][1][1]
-            traceback_address = test._outcome.errors[0][1][2]
+            exc_message = test._outcome.errors[-1][1][1]
+            traceback_address = test._outcome.errors[-1][1][2]
             traceback_list = traceback.format_list(
                 traceback.extract_tb(traceback_address)[1:]
             )
@@ -225,12 +221,11 @@ def log_test_failure_data(test, test_logpath, driver, browser, url=None):
         data_to_save.append("Exception: %s" % exc_message)
     else:
         traceback_message = None
-        if hasattr(test, "is_behave") and test.is_behave:
+        if getattr(test, "is_behave", None):
             if sb_config.behave_scenario.status.name == "failed":
                 if (
                     hasattr(sb_config, "behave_step")
-                    and hasattr(sb_config.behave_step, "error_message")
-                    and sb_config.behave_step.error_message
+                    and getattr(sb_config.behave_step, "error_message", None)
                 ):
                     traceback_message = sb_config.behave_step.error_message
         else:
@@ -262,7 +257,7 @@ def log_test_failure_data(test, test_logpath, driver, browser, url=None):
                 )
             else:
                 message = None
-                if hasattr(test, "is_behave") and test.is_behave:
+                if getattr(test, "is_behave", None):
                     message = "Behave step was not implemented or skipped!"
                 else:
                     message = "Traceback not found!"
@@ -281,7 +276,7 @@ def log_test_failure_data(test, test_logpath, driver, browser, url=None):
                 data_to_save.append("Exception: %s" % sb_config._excinfo_value)
         else:
             data_to_save.append("Traceback:\n  %s" % traceback_message)
-    if hasattr(test, "is_nosetest") and test.is_nosetest:
+    if getattr(test, "is_nosetest", None):
         # Also save the data for the report
         sb_config._report_test_id = test_id
         sb_config._report_fail_page = last_page
@@ -394,7 +389,7 @@ def log_page_source(test_logpath, driver, source=None):
 
 
 def get_test_id(test):
-    if hasattr(test, "is_behave") and test.is_behave:
+    if getattr(test, "is_behave", None):
         file_name = sb_config.behave_scenario.filename
         line_num = sb_config.behave_line_num
         scenario_name = sb_config.behave_scenario.name
@@ -402,7 +397,7 @@ def get_test_id(test):
             scenario_name = scenario_name.split(" -- @")[0]
         test_id = "%s:%s => %s" % (file_name, line_num, scenario_name)
         return test_id
-    elif hasattr(test, "is_context_manager") and test.is_context_manager:
+    elif getattr(test, "is_context_manager", None):
         filename = test.__class__.__module__.split(".")[-1] + ".py"
         classname = test.__class__.__name__
         methodname = test._testMethodName
@@ -412,7 +407,7 @@ def get_test_id(test):
 
             stack_base = traceback.format_stack()[0].split(", in ")[0]
             test_base = stack_base.split(", in ")[0].split(os.sep)[-1]
-            if hasattr(test, "cm_filename") and test.cm_filename:
+            if getattr(test, "cm_filename", None):
                 filename = test.cm_filename
             else:
                 filename = test_base.split('"')[0]

seleniumbase/core/mysql.py

@@ -42,7 +42,7 @@ class DatabaseManager:
         db_user = settings.DB_USERNAME
         db_pass = settings.DB_PASSWORD
         db_schema = settings.DB_SCHEMA
-        if hasattr(sb_config, "settings_file") and sb_config.settings_file:
+        if getattr(sb_config, "settings_file", None):
             override = settings_parser.set_settings(sb_config.settings_file)
             if "DB_HOST" in override.keys():
                 db_server = override["DB_HOST"]

seleniumbase/core/report_helper.py

@@ -100,18 +100,14 @@ def process_failures(test, test_count, duration):
     bad_page_image = "failure_%s.png" % test_count
     bad_page_data = "failure_%s.txt" % test_count
     screenshot_path = os.path.join(LATEST_REPORT_DIR, bad_page_image)
-    if hasattr(test, "_last_page_screenshot") and test._last_page_screenshot:
+    if getattr(test, "_last_page_screenshot", None):
         with open(screenshot_path, mode="wb") as file:
             file.write(test._last_page_screenshot)
     save_test_failure_data(test, bad_page_data, folder=LATEST_REPORT_DIR)
     exc_message = None
-    if (
-        hasattr(test, "_outcome")
-        and hasattr(test._outcome, "errors")
-        and test._outcome.errors
-    ):
+    if hasattr(test, "_outcome") and getattr(test._outcome, "errors", None):
         try:
-            exc_message = test._outcome.errors[0][1][1]
+            exc_message = test._outcome.errors[-1][1][1]
         except Exception:
             exc_message = "(Unknown Exception)"
     else: