seleniumbase 4.15.14__py3-none-any.whl → 4.16.0__py3-none-any.whl

sbase/__init__.py

@@ -6,6 +6,7 @@ from seleniumbase import DriverContext  # noqa
 from seleniumbase import encryption  # noqa
 from seleniumbase import get_driver  # noqa
 from seleniumbase import js_utils  # noqa
+from seleniumbase import shared_utils  # noqa
 from seleniumbase import MasterQA  # noqa
 from seleniumbase import page_actions  # noqa
 from seleniumbase import page_utils  # noqa

seleniumbase/__init__.py

@@ -14,6 +14,7 @@ from seleniumbase.core.browser_launcher import get_driver  # noqa
 from seleniumbase.fixtures import js_utils  # noqa
 from seleniumbase.fixtures import page_actions  # noqa
 from seleniumbase.fixtures import page_utils  # noqa
+from seleniumbase.fixtures import shared_utils  # noqa
 from seleniumbase.fixtures.base_case import BaseCase  # noqa
 from seleniumbase.masterqa.master_qa import MasterQA  # noqa
 from seleniumbase.plugins.sb_manager import SB  # noqa

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.15.14"
+__version__ = "4.16.0"

seleniumbase/behave/behave_sb.py

@@ -82,8 +82,8 @@ behave -D agent="User Agent String" -D demo
 -D incognito  (Enable Chrome's Incognito mode.)
 -D guest  (Enable Chrome's Guest mode.)
 -D devtools  (Open Chrome's DevTools when the browser opens.)
--D reuse-session | -D rs  (Reuse browser session for all tests.)
--D reuse-class-session | -D rcs  (Reuse session for tests in class/feature)
+-D rs | -D reuse-session  (Reuse browser session for all tests.)
+-D rcs | -D reuse-class-session  (Reuse session for tests in class/feature)
 -D crumbs  (Delete all cookies between tests reusing a session.)
 -D disable-beforeunload  (Disable the "beforeunload" event on Chrome.)
 -D window-size=WIDTH,HEIGHT  (Set the browser's starting window size.)
@@ -95,24 +95,21 @@ behave -D agent="User Agent String" -D demo
 -D external-pdf  (Set Chromium "plugins.always_open_pdf_externally":True.)
 -D timeout-multiplier=MULTIPLIER  (Multiplies the default timeout values.)
 """
-
 import ast
 import colorama
 import os
 import re
 import sys
+from seleniumbase import config as sb_config
 from seleniumbase.config import settings
-from seleniumbase.core import log_helper
 from seleniumbase.core import download_helper
+from seleniumbase.core import log_helper
 from seleniumbase.core import proxy_helper
 from seleniumbase.core import session_helper
 from seleniumbase.fixtures import constants
-from seleniumbase import config as sb_config
+from seleniumbase.fixtures import shared_utils
 
 sb_config.__base_class = None
-is_windows = False
-if sys.platform in ["win32", "win64", "x64"]:
-    is_windows = True
 
 
 def set_base_class(base_class):
@@ -817,10 +814,10 @@ def get_configured_sb(context):
             '\n  (Your browser choice was: "%s")\n' % sb.browser
         )
     # The Xvfb virtual display server is for Linux OS Only.
-    if sb.xvfb and "linux" not in sys.platform:
+    if sb.xvfb and not shared_utils.is_linux():
         sb.xvfb = False
     if (
-        "linux" in sys.platform
+        shared_utils.is_linux()
         and not sb.headed
         and not sb.headless
         and not sb.headless2
@@ -931,7 +928,6 @@ def get_configured_sb(context):
     log_helper.log_folder_setup(sb.log_path, sb.archive_logs)
     download_helper.reset_downloads_folder()
     proxy_helper.remove_proxy_zip_if_present()
-
     return sb
 
 
@@ -1007,7 +1003,7 @@ def dashboard_pre_processing():
     filename = None
     feature_name = None
     scenario_name = None
-    if is_windows:
+    if shared_utils.is_windows():
         output = output.decode("latin1")
     else:
         output = output.decode("utf-8")
@@ -1116,7 +1112,7 @@ def behave_dashboard_prepare():
         stars = "*" * star_len
         c1 = ""
         cr = ""
-        if "linux" not in sys.platform:
+        if not shared_utils.is_linux():
             colorama.init(autoreset=True)
             c1 = colorama.Fore.BLUE + colorama.Back.LIGHTCYAN_EX
             cr = colorama.Style.RESET_ALL
@@ -1124,9 +1120,6 @@ def behave_dashboard_prepare():
 
 
 def _perform_behave_unconfigure_():
-    from seleniumbase.core import log_helper
-    from seleniumbase.core import proxy_helper
-
     if hasattr(sb_config, "multi_proxy") and not sb_config.multi_proxy:
         proxy_helper.remove_proxy_zip_if_present()
     if hasattr(sb_config, "reuse_session") and sb_config.reuse_session:
@@ -1134,7 +1127,7 @@ def _perform_behave_unconfigure_():
         if sb_config.shared_driver:
             try:
                 if (
-                    not is_windows
+                    not shared_utils.is_windows()
                     or sb_config.browser == "ie"
                     or sb_config.shared_driver.service.process
                 ):
@@ -1210,7 +1203,7 @@ def do_final_driver_cleanup_as_needed():
     try:
         if hasattr(sb_config, "last_driver") and sb_config.last_driver:
             if (
-                not is_windows
+                not shared_utils.is_windows()
                 or sb_config.browser == "ie"
                 or sb_config.last_driver.service.process
             ):
@@ -1232,7 +1225,7 @@ def _perform_behave_terminal_summary_():
     equals = "=" * (equals_len + 2)
     c2 = ""
     cr = ""
-    if "linux" not in sys.platform:
+    if not shared_utils.is_linux():
         colorama.init(autoreset=True)
         c2 = colorama.Fore.MAGENTA + colorama.Back.LIGHTYELLOW_EX
         cr = colorama.Style.RESET_ALL

seleniumbase/common/exceptions.py

@@ -5,6 +5,7 @@
     NotUsingChromeException => Used by Chrome-only methods if not using Chrome.
     NotUsingChromiumException => Used by Chromium-only methods if not Chromium.
     OutOfScopeException => Used by BaseCase methods when setUp() is skipped.
+    ProxyConnectionException => Called when the proxy connection failed.
     TextNotVisibleException => Called when expected text fails to appear.
     TimeLimitExceededException => Called when exceeding "--time-limit=SECONDS".
     TimeoutException => Called when some timeout limit has been exceeded.
@@ -36,6 +37,10 @@ class OutOfScopeException(Exception):
     pass
 
 
+class ProxyConnectionException(Exception):
+    pass
+
+
 class TextNotVisibleException(Exception):
     pass
 

seleniumbase/config/settings.py

@@ -37,6 +37,13 @@ ARCHIVE_EXISTING_LOGS = False
 # If False, only the downloads from the most recent run will be saved locally.
 ARCHIVE_EXISTING_DOWNLOADS = False
 
+# If True, the last page screenshot will include the <body> and background.
+# If False, the last page screenshot will only include the <body> section.
+# Depending on the screen size, including a background could make the <body>
+# appear very small in the screenshot, which may require manually zooming in
+# on the <body> to see page details if you decide to include the background.
+SCREENSHOT_WITH_BACKGROUND = False
+
 # Default names for files saved during test failures.
 # (These files will get saved to the "latest_logs/" folder.)
 SCREENSHOT_NAME = "screenshot.png"

seleniumbase/console_scripts/ReadMe.md

@@ -62,8 +62,8 @@ sbase install [DRIVER] [OPTIONS]
 sbase get chromedriver
 sbase get geckodriver
 sbase get edgedriver
-sbase get chromedriver 112
-sbase get chromedriver 112.0.5615.49
+sbase get chromedriver 114
+sbase get chromedriver 114.0.5735.90
 sbase get chromedriver latest
 sbase get chromedriver latest-1  # (Latest minus one)
 sbase get chromedriver -p

seleniumbase/console_scripts/run.py

@@ -40,7 +40,6 @@ import colorama
 import sys
 import time
 from seleniumbase.fixtures import constants
-from seleniumbase.fixtures import shared_utils
 
 colorama.init(autoreset=True)
 
@@ -144,8 +143,8 @@ def show_install_usage():
     print("           sbase get chromedriver")
     print("           sbase get geckodriver")
     print("           sbase get edgedriver")
-    print("           sbase get chromedriver 112")
-    print("           sbase get chromedriver 112.0.5615.49")
+    print("           sbase get chromedriver 114")
+    print("           sbase get chromedriver 114.0.5735.90")
     print("           sbase get chromedriver latest")
     print("           sbase get chromedriver latest-1")
     print("           sbase get chromedriver -p")
@@ -976,12 +975,14 @@ def main():
             retry_msg_1 = "* Unable to download driver! Retrying in 3s..."
             retry_msg_2 = "** Unable to download driver! Retrying in 5s..."
             if " --proxy=" in " ".join(sys.argv):
+                from seleniumbase.core import proxy_helper
+
                 for arg in sys.argv:
                     if arg.startswith("--proxy="):
                         proxy_string = arg.split("--proxy=")[1]
                         if "@" in proxy_string:
                             proxy_string = proxy_string.split("@")[1]
-                        shared_utils.validate_proxy_string(proxy_string)
+                        proxy_helper.validate_proxy_string(proxy_string)
                         break
             try:
                 sb_install.main()

seleniumbase/console_scripts/sb_behave_gui.py

@@ -23,13 +23,10 @@ if sys.version_info <= (3, 7):
         "\n* SBase Commander requires Python 3.7 or newer!"
         "\n** You are currently using Python %s" % current_version
     )
+from seleniumbase.fixtures import shared_utils
 import tkinter as tk  # noqa: E402
 from tkinter.scrolledtext import ScrolledText  # noqa: E402
 
-is_windows = False
-if sys.platform in ["win32", "win64", "x64"]:
-    is_windows = True
-
 
 def set_colors(use_colors):
     c0 = ""
@@ -127,7 +124,7 @@ def do_behave_run(
 
     if headless:
         full_run_command += " -D headless"
-    elif "linux" in sys.platform:
+    elif shared_utils.is_linux():
         full_run_command += " -D gui"
 
     if save_screenshots:
@@ -188,7 +185,7 @@ def create_tkinter_gui(tests, command_string, t_count, f_count, s_tests):
         "Use Edge Browser  (-D edge)",
         "Use Firefox Browser  (-D firefox)",
     ]
-    if "darwin" in sys.platform:
+    if shared_utils.is_mac():
         options_list.append("Use Safari Browser  (-D safari)")
     brx = tk.StringVar(root)
     brx.set(options_list[0])
@@ -267,7 +264,7 @@ def create_tkinter_gui(tests, command_string, t_count, f_count, s_tests):
         row += " " * 200
         ara[count] = tk.IntVar()
         cb = None
-        if not is_windows:
+        if not shared_utils.is_windows():
             cb = tk.Checkbutton(
                 text_area,
                 text=(row),
@@ -362,7 +359,7 @@ def create_tkinter_gui(tests, command_string, t_count, f_count, s_tests):
 
 def main():
     use_colors = True
-    if "linux" in sys.platform:
+    if shared_utils.is_linux():
         use_colors = False
     c0, c1, c2, c3, c4, c5, c6, cr = set_colors(use_colors)
     command_args = sys.argv[2:]
@@ -414,7 +411,7 @@ def main():
     f_count = 0
     s_count = 0
     t_count = 0
-    if is_windows:
+    if shared_utils.is_windows():
         output = output.decode("latin1")
     else:
         output = output.decode("utf-8")

seleniumbase/console_scripts/sb_caseplans.py

@@ -27,14 +27,11 @@ if sys.version_info <= (3, 7):
         "\n* SBase Case Plans Generator requires Python 3.7 or newer!"
         "\n** You are currently using Python %s" % current_version
     )
+from seleniumbase.fixtures import shared_utils
 import tkinter as tk  # noqa: E402
 from tkinter import messagebox  # noqa: E402
 from tkinter.scrolledtext import ScrolledText  # noqa: E402
 
-is_windows = False
-if sys.platform in ["win32", "win64", "x64"]:
-    is_windows = True
-
 
 def set_colors(use_colors):
     c0 = ""
@@ -404,7 +401,7 @@ def create_tkinter_gui(tests, command_string):
         row += " " * 200
         ara[count] = tk.IntVar()
         cb = None
-        if not is_windows:
+        if not shared_utils.is_windows():
             cb = tk.Checkbutton(
                 text_area,
                 text=(row),

seleniumbase/console_scripts/sb_commander.py

@@ -28,13 +28,10 @@ if sys.version_info <= (3, 7):
         "\n* SBase Commander requires Python 3.7 or newer!"
         "\n** You are currently using Python %s" % current_version
     )
+from seleniumbase.fixtures import shared_utils
 import tkinter as tk  # noqa: E402
 from tkinter.scrolledtext import ScrolledText  # noqa: E402
 
-is_windows = False
-if sys.platform in ["win32", "win64", "x64"]:
-    is_windows = True
-
 
 def set_colors(use_colors):
     c0 = ""
@@ -154,7 +151,7 @@ def do_pytest_run(
 
     if headless:
         full_run_command += " --headless"
-    elif "linux" in sys.platform:
+    elif shared_utils.is_linux():
         full_run_command += " --gui"
 
     if save_screenshots:
@@ -191,7 +188,7 @@ def create_tkinter_gui(tests, command_string, files, solo_tests):
         "Use Edge Browser  (--edge)",
         "Use Firefox Browser  (--firefox)",
     ]
-    if "darwin" in sys.platform:
+    if shared_utils.is_mac():
         options_list.append("Use Safari Browser  (--safari)")
     brx = tk.StringVar(root)
     brx.set(options_list[0])
@@ -302,7 +299,7 @@ def create_tkinter_gui(tests, command_string, files, solo_tests):
         row += " " * 200
         ara[count] = tk.IntVar()
         cb = None
-        if not is_windows:
+        if not shared_utils.is_windows():
             cb = tk.Checkbutton(
                 text_area,
                 text=(row),
@@ -401,7 +398,7 @@ def create_tkinter_gui(tests, command_string, files, solo_tests):
 
 def main():
     use_colors = True
-    if "linux" in sys.platform:
+    if shared_utils.is_linux():
         use_colors = False
     c0, c1, c2, c3, c4, c5, cr = set_colors(use_colors)
     command_args = sys.argv[2:]

seleniumbase/console_scripts/sb_install.py

@@ -14,8 +14,8 @@ Examples:
          sbase get chromedriver
          sbase get geckodriver
          sbase get edgedriver
-         sbase get chromedriver 112
-         sbase get chromedriver 112.0.5615.49
+         sbase get chromedriver 114
+         sbase get chromedriver 114.0.5735.90
          sbase get chromedriver latest
          sbase get chromedriver latest-1  # (Latest minus one)
          sbase get chromedriver -p
@@ -32,6 +32,7 @@ import platform
 import requests
 import shutil
 import sys
+import time
 import tarfile
 import urllib3
 import zipfile
@@ -42,26 +43,18 @@ from seleniumbase import drivers  # webdriver storage folder for SeleniumBase
 
 urllib3.disable_warnings()
 selenium4_or_newer = False
-if sys.version_info[0] == 3 and sys.version_info[1] >= 7:
+if sys.version_info >= (3, 7):
     selenium4_or_newer = True
-IS_ARM_MAC = False
-if (
-    sys.platform.endswith("darwin")
-    and (
-        "arm" in platform.processor().lower()
-        or "arm64" in platform.version().lower()
-    )
-):
-    IS_ARM_MAC = True
-PLAT = sys.platform
-IS_WINDOWS = False
-if "win32" in PLAT or "win64" in PLAT or "x64" in PLAT or "x86" in PLAT:
-    IS_WINDOWS = True
+ARCH = platform.architecture()[0]
+IS_ARM_MAC = shared_utils.is_arm_mac()
+IS_MAC = shared_utils.is_mac()
+IS_LINUX = shared_utils.is_linux()
+IS_WINDOWS = shared_utils.is_windows()
 DRIVER_DIR = os.path.dirname(os.path.realpath(drivers.__file__))
 LOCAL_PATH = "/usr/local/bin/"  # On Mac and Linux systems
 DEFAULT_CHROMEDRIVER_VERSION = "72.0.3626.69"  # (If can't find LATEST_STABLE)
 DEFAULT_GECKODRIVER_VERSION = "v0.33.0"
-DEFAULT_EDGEDRIVER_VERSION = "112.0.1722.58"  # (If can't find LATEST_STABLE)
+DEFAULT_EDGEDRIVER_VERSION = "114.0.1823.82"  # (If can't find LATEST_STABLE)
 DEFAULT_OPERADRIVER_VERSION = "v.96.0.4664.45"
 
 
@@ -86,8 +79,8 @@ def invalid_run_command():
     exp += "           sbase get chromedriver\n"
     exp += "           sbase get geckodriver\n"
     exp += "           sbase get edgedriver\n"
-    exp += "           sbase get chromedriver 112\n"
-    exp += "           sbase get chromedriver 112.0.5615.49\n"
+    exp += "           sbase get chromedriver 114\n"
+    exp += "           sbase get chromedriver 114.0.5735.90\n"
     exp += "           sbase get chromedriver latest\n"
     exp += "           sbase get chromedriver latest-1\n"
     exp += "           sbase get chromedriver -p\n"
@@ -124,6 +117,8 @@ def requests_get_with_retry(url):
     protocol = "http"
     user_and_pass = None
     if " --proxy=" in " ".join(sys.argv):
+        from seleniumbase.core import proxy_helper
+
         for arg in sys.argv:
             if arg.startswith("--proxy="):
                 proxy_string = arg.split("--proxy=")[1]
@@ -144,7 +139,7 @@ def requests_get_with_retry(url):
                     protocol = "socks4"
                 elif "socks5" in proxy_string:
                     protocol = "socks5"
-                proxy_string = shared_utils.validate_proxy_string(proxy_string)
+                proxy_string = proxy_helper.validate_proxy_string(proxy_string)
                 if user_and_pass:
                     proxy_string = "%s@%s" % (user_and_pass, proxy_string)
                 use_proxy = True
@@ -155,8 +150,6 @@ def requests_get_with_retry(url):
         try:
             response = requests.get(url, proxies=proxies)
         except Exception:
-            import time
-
             time.sleep(0.75)
             response = requests.get(url, proxies=proxies)
         return response
@@ -164,8 +157,6 @@ def requests_get_with_retry(url):
         try:
             response = requests.get(url)
         except Exception:
-            import time
-
             time.sleep(0.75)
             response = requests.get(url)
         return response
@@ -220,7 +211,6 @@ def main(override=None, intel_for_uc=None):
     headless_ie_exists = False
     headless_ie_file_name = None
     downloads_folder = DRIVER_DIR
-    sys_plat = sys.platform
     expected_contents = None
     platform_code = None
     inner_folder = None
@@ -236,7 +226,7 @@ def main(override=None, intel_for_uc=None):
     c4 = colorama.Fore.LIGHTRED_EX + colorama.Back.LIGHTWHITE_EX
     c5 = colorama.Fore.RED + colorama.Back.LIGHTWHITE_EX
     cr = colorama.Style.RESET_ALL
-    if "linux" in sys_plat:
+    if IS_LINUX:
         c1 = ""
         c2 = ""
         c3 = ""
@@ -292,7 +282,7 @@ def main(override=None, intel_for_uc=None):
                 copy_to_path = True
             else:
                 invalid_run_command()
-        if "darwin" in sys_plat:
+        if IS_MAC:
             if IS_ARM_MAC and not intel_for_uc:
                 if use_version == "latest" or use_version == "latest-1":
                     use_version = requests_get(last).text
@@ -306,7 +296,7 @@ def main(override=None, intel_for_uc=None):
                 file_name = "chromedriver_mac_arm64.zip"
             else:
                 file_name = "chromedriver_mac64.zip"
-        elif "linux" in sys_plat:
+        elif IS_LINUX:
             file_name = "chromedriver_linux64.zip"
         elif IS_WINDOWS:
             file_name = "chromedriver_win32.zip"  # Works for win32 / win_x64
@@ -394,11 +384,10 @@ def main(override=None, intel_for_uc=None):
                 copy_to_path = True
             else:
                 invalid_run_command()
-        if "darwin" in sys_plat:
+        if IS_MAC:
             file_name = "geckodriver-%s-macos.tar.gz" % use_version
-        elif "linux" in sys_plat:
-            arch = platform.architecture()[0]
-            if "64" in arch:
+        elif IS_LINUX:
+            if "64" in ARCH:
                 file_name = "geckodriver-%s-linux64.tar.gz" % use_version
             else:
                 file_name = "geckodriver-%s-linux32.tar.gz" % use_version
@@ -484,19 +473,19 @@ def main(override=None, intel_for_uc=None):
             else:
                 use_version = DEFAULT_EDGEDRIVER_VERSION
         suffix = None
-        if "win64" in sys_plat or "x64" in sys_plat:
+        if IS_WINDOWS and "64" in ARCH:
             file_name = "edgedriver_win64.zip"
             suffix = "WINDOWS"
-        elif "win32" in sys_plat or "x86" in sys_plat:
+        elif IS_WINDOWS:
             file_name = "edgedriver_win32.zip"
             suffix = "WINDOWS"
-        elif "darwin" in sys_plat:
+        elif IS_MAC:
             if IS_ARM_MAC and int(use_version.split(".")[0]) > 104:
                 file_name = "edgedriver_mac64_m1.zip"
             else:
                 file_name = "edgedriver_mac64.zip"
             suffix = "MACOS"
-        elif "linux" in sys_plat:
+        elif IS_LINUX:
             file_name = "edgedriver_linux64.zip"
             suffix = "LINUX"
         else:
@@ -526,10 +515,10 @@ def main(override=None, intel_for_uc=None):
         major_version = "3.14"
         full_version = "3.14.0"
         use_version = full_version
-        if "win32" in sys_plat:
-            file_name = "IEDriverServer_Win32_%s.zip" % full_version
-        elif "win64" in sys_plat or "x64" in sys_plat:
+        if IS_WINDOWS and "64" in ARCH:
             file_name = "IEDriverServer_x64_%s.zip" % full_version
+        elif IS_WINDOWS:
+            file_name = "IEDriverServer_Win32_%s.zip" % full_version
         else:
             raise Exception(
                 "Sorry! IEDriver is only for "
@@ -568,7 +557,7 @@ def main(override=None, intel_for_uc=None):
                 copy_to_path = True
             else:
                 invalid_run_command()
-        if "darwin" in sys_plat:
+        if IS_MAC:
             file_name = "operadriver_mac64.zip"
             platform_code = "mac64"
             inner_folder = "operadriver_%s/" % platform_code
@@ -577,7 +566,7 @@ def main(override=None, intel_for_uc=None):
                 "operadriver_mac64/operadriver",
                 "operadriver_mac64/sha512_sum",
             ]
-        elif "linux" in sys_plat:
+        elif IS_LINUX:
             file_name = "operadriver_linux64.zip"
             platform_code = "linux64"
             inner_folder = "operadriver_%s/" % platform_code
@@ -586,16 +575,7 @@ def main(override=None, intel_for_uc=None):
                 "operadriver_linux64/operadriver",
                 "operadriver_linux64/sha512_sum",
             ]
-        elif "win32" in sys_plat:
-            file_name = "operadriver_win32.zip"
-            platform_code = "win32"
-            inner_folder = "operadriver_%s/" % platform_code
-            expected_contents = [
-                "operadriver_win32/",
-                "operadriver_win32/operadriver.exe",
-                "operadriver_win32/sha512_sum",
-            ]
-        elif "win64" in sys_plat or "x64" in sys_plat:
+        elif IS_WINDOWS and "64" in ARCH:
             file_name = "operadriver_win64.zip"
             platform_code = "win64"
             inner_folder = "operadriver_%s/" % platform_code
@@ -604,6 +584,15 @@ def main(override=None, intel_for_uc=None):
                 "operadriver_win64/operadriver.exe",
                 "operadriver_win64/sha512_sum",
             ]
+        elif IS_WINDOWS:
+            file_name = "operadriver_win32.zip"
+            platform_code = "win32"
+            inner_folder = "operadriver_%s/" % platform_code
+            expected_contents = [
+                "operadriver_win32/",
+                "operadriver_win32/operadriver.exe",
+                "operadriver_win32/sha512_sum",
+            ]
         else:
             raise Exception(
                 "Cannot determine which version of Operadriver to download!"
@@ -743,7 +732,7 @@ def main(override=None, intel_for_uc=None):
                 new_file = os.path.join(downloads_folder, str(f_name))
                 if (
                     intel_for_uc
-                    and "darwin" in sys_plat
+                    and IS_MAC
                     and new_file.endswith("drivers/chromedriver")
                 ):
                     new_file = new_file.replace(
@@ -806,7 +795,7 @@ def main(override=None, intel_for_uc=None):
                     print("Also copied to: %s%s%s" % (c3, path_file, cr))
             print("")
         elif name == "edgedriver" or name == "msedgedriver":
-            if "darwin" in sys_plat or "linux" in sys_plat:
+            if IS_MAC or IS_LINUX:
                 # Mac / Linux
                 expected_contents = [
                     "Driver_Notes/",
@@ -840,7 +829,7 @@ def main(override=None, intel_for_uc=None):
                 # Remove existing version if exists
                 str_name = str(f_name)
                 new_file = os.path.join(downloads_folder, str_name)
-                if "darwin" in sys_plat or "linux" in sys_plat:
+                if IS_MAC or IS_LINUX:
                     # Mac / Linux
                     if str_name == "msedgedriver":
                         driver_file = str_name

seleniumbase/console_scripts/sb_mkchart.py

@@ -183,8 +183,8 @@ def main():
         chart_options = '"circular", "barras", "columnas", "líneas", "área"'
 
     import_line = "from seleniumbase import BaseCase"
+    main_line = "BaseCase.main(__name__, __file__)"
     parent_class = "BaseCase"
-    class_line = "class MyTestClass(BaseCase):"
     if language != "English":
         from seleniumbase.translate.master_dict import MD_F
 
@@ -196,6 +196,7 @@ def main():
     add_slide = '"<p>Chart Demo</p>" + self.extract_chart()'
     data = []
     data.append("%s" % import_line)
+    data.append("%s" % main_line)
     data.append("")
     data.append("")
     data.append("%s" % class_line)
@@ -204,12 +205,12 @@ def main():
     data.append("")
     data.append("        # %s => %s" % (select_option, chart_options))
     data.append("        self.create_pie_chart(%s)" % chart_settings)
-    data.append('        self.add_data_point("%s A", 50)' % item)
-    data.append('        self.add_data_point("%s B", 40)' % item)
-    data.append('        self.add_data_point("%s C", 35)' % item)
-    data.append('        self.add_data_point("%s D", 30)' % item)
-    data.append('        self.add_data_point("%s E", 25)' % item)
-    data.append('        self.add_data_point("%s F", 20)' % item)
+    data.append('        self.add_data_point("%s A", 36)' % item)
+    data.append('        self.add_data_point("%s B", 33)' % item)
+    data.append('        self.add_data_point("%s C", 27)' % item)
+    data.append('        self.add_data_point("%s D", 21)' % item)
+    data.append('        self.add_data_point("%s E", 18)' % item)
+    data.append('        self.add_data_point("%s F", 15)' % item)
     data.append("        self.add_slide(%s)" % add_slide)
     data.append("")
     data.append('        self.begin_presentation(filename="%s")' % html_name)
@@ -243,6 +244,10 @@ def main():
                         # Example: self.assert_true("Name" in self.get_title())
                         line = new_line
                         continue
+            if main_line in line:
+                new_main = "%s.main(__name__, __file__)" % parent_class
+                new_line = line.replace(main_line, new_main)
+                found_swap = True
             if found_swap:
                 if new_line.endswith("  # noqa"):  # Remove flake8 skip
                     new_line = new_line[0 : -len("  # noqa")]