From 5d7d7bb3129cfc9140a01365fd9993511abfeaf4 Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Tue, 29 Aug 2023 13:06:23 -0400 Subject: [PATCH 1/2] Refactor and fix error-handling on Edge --- seleniumbase/core/browser_launcher.py | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/seleniumbase/core/browser_launcher.py b/seleniumbase/core/browser_launcher.py index 668eeb096e7..3145a9cb8d2 100644 --- a/seleniumbase/core/browser_launcher.py +++ b/seleniumbase/core/browser_launcher.py @@ -457,9 +457,9 @@ def _add_chrome_proxy_extension( """Implementation of https://stackoverflow.com/a/35293284 for https://stackoverflow.com/questions/12848327/ (Run Selenium on a proxy server that requires authentication.)""" - arg_join = " ".join(sys.argv) + args = " ".join(sys.argv) if ( - not ("-n" in sys.argv or " -n=" in arg_join or arg_join == "-c") + not ("-n" in sys.argv or " -n=" in args or args == "-c") and not multi_proxy ): # Single-threaded @@ -870,10 +870,9 @@ def _set_chrome_options( # To access the Debugger, go to: chrome://inspect/#devices # while a Chromium driver is running. # Info: https://chromedevtools.github.io/devtools-protocol/ - sys_argv = sys.argv - arg_join = " ".join(sys_argv) + args = " ".join(sys.argv) debug_port = 9222 - if ("-n" in sys.argv) or (" -n=" in arg_join) or ("-c" in sys.argv): + if ("-n" in sys.argv or " -n=" in args or args == "-c"): debug_port = service_utils.free_port() chrome_options.add_argument("--remote-debugging-port=%s" % debug_port) if swiftshader: @@ -2605,8 +2604,7 @@ def get_local_driver( # To access the Debugger, go to: edge://inspect/#devices # while a Chromium driver is running. # Info: https://chromedevtools.github.io/devtools-protocol/ - sys_argv = sys.argv - arg_join = " ".join(sys_argv) + args = " ".join(sys.argv) free_port = 9222 if ("-n" in sys.argv or " -n=" in args or args == "-c"): free_port = service_utils.free_port() @@ -2670,8 +2668,7 @@ def get_local_driver( service_args=["--disable-build-check"], ) # https://stackoverflow.com/a/56638103/7058266 - sys_argv = sys.argv - arg_join = " ".join(sys_argv) + args = " ".join(sys.argv) free_port = 9222 if ("-n" in sys.argv or " -n=" in args or args == "-c"): free_port = service_utils.free_port() @@ -2744,8 +2741,7 @@ def get_local_driver( service_args=["--disable-build-check"], ) # https://stackoverflow.com/a/56638103/7058266 - sys_argv = sys.argv - arg_join = " ".join(sys_argv) + args = " ".join(sys.argv) free_port = 9222 if ("-n" in sys.argv or " -n=" in args or args == "-c"): free_port = service_utils.free_port() @@ -2778,8 +2774,8 @@ def get_local_driver( ) return driver elif browser_name == constants.Browser.SAFARI: - arg_join = " ".join(sys.argv) - if ("-n" in sys.argv) or (" -n=" in arg_join) or (arg_join == "-c"): + args = " ".join(sys.argv) + if ("-n" in sys.argv or " -n=" in args or args == "-c"): # Skip if multithreaded raise Exception("Can't run Safari tests in multithreaded mode!") warnings.simplefilter("ignore", category=DeprecationWarning) From 16c32d50c4682ef90e8e76afef16f1a3bbf9c093 Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Tue, 29 Aug 2023 13:06:45 -0400 Subject: [PATCH 2/2] Version 4.17.13 --- seleniumbase/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seleniumbase/__version__.py b/seleniumbase/__version__.py index 8eb03dbe8bc..379cb173838 100755 --- a/seleniumbase/__version__.py +++ b/seleniumbase/__version__.py @@ -1,2 +1,2 @@ # seleniumbase package -__version__ = "4.17.12" +__version__ = "4.17.13"