Do some refactoring

Author: mdmintz

seleniumbase/fixtures/shared_utils.py

@@ -81,46 +81,46 @@ def format_exc(exception, message):
     from seleniumbase.common.exceptions import TextNotVisibleException
     from seleniumbase.common import exceptions
 
-    if exception == Exception:
+    if exception is Exception:
         exc = Exception
         return exc, message
-    elif exception == ElementNotVisibleException:
+    elif exception is ElementNotVisibleException:
         exc = exceptions.ElementNotVisibleException
     elif exception == "ElementNotVisibleException":
         exc = exceptions.ElementNotVisibleException
-    elif exception == LinkTextNotFoundException:
+    elif exception is LinkTextNotFoundException:
         exc = exceptions.LinkTextNotFoundException
     elif exception == "LinkTextNotFoundException":
         exc = exceptions.LinkTextNotFoundException
-    elif exception == NoSuchElementException:
+    elif exception is NoSuchElementException:
         exc = exceptions.NoSuchElementException
     elif exception == "NoSuchElementException":
         exc = exceptions.NoSuchElementException
-    elif exception == TextNotVisibleException:
+    elif exception is TextNotVisibleException:
         exc = exceptions.TextNotVisibleException
     elif exception == "TextNotVisibleException":
         exc = exceptions.TextNotVisibleException
-    elif exception == NoAlertPresentException:
+    elif exception is NoAlertPresentException:
         exc = exceptions.NoAlertPresentException
     elif exception == "NoAlertPresentException":
         exc = exceptions.NoAlertPresentException
-    elif exception == NoSuchAttributeException:
+    elif exception is NoSuchAttributeException:
         exc = exceptions.NoSuchAttributeException
     elif exception == "NoSuchAttributeException":
         exc = exceptions.NoSuchAttributeException
-    elif exception == NoSuchFrameException:
+    elif exception is NoSuchFrameException:
         exc = exceptions.NoSuchFrameException
     elif exception == "NoSuchFrameException":
         exc = exceptions.NoSuchFrameException
-    elif exception == NoSuchWindowException:
+    elif exception is NoSuchWindowException:
         exc = exceptions.NoSuchWindowException
     elif exception == "NoSuchWindowException":
         exc = exceptions.NoSuchWindowException
-    elif exception == NoSuchFileException:
+    elif exception is NoSuchFileException:
         exc = exceptions.NoSuchFileException
     elif exception == "NoSuchFileException":
         exc = exceptions.NoSuchFileException
-    elif exception == NoSuchOptionException:
+    elif exception is NoSuchOptionException:
         exc = exceptions.NoSuchOptionException
     elif exception == "NoSuchOptionException":
         exc = exceptions.NoSuchOptionException

seleniumbase/plugins/driver_manager.py

@@ -125,7 +125,9 @@ def Driver(
     uc_cdp=None,  # Shortcut / Duplicate of "uc_cdp_events".
     uc_sub=None,  # Shortcut / Duplicate of "uc_subprocess".
     log_cdp=None,  # Shortcut / Duplicate of "log_cdp_events".
+    ad_block=None,  # Shortcut / Duplicate of "ad_block_on".
     server=None,  # Shortcut / Duplicate of "servername".
+    guest=None,  # Shortcut / Duplicate of "guest_mode".
     wire=None,  # Shortcut / Duplicate of "use_wire".
     pls=None,  # Shortcut / Duplicate of "page_load_strategy".
 ):
@@ -263,6 +265,8 @@ def Driver(
             incognito = True
         else:
             incognito = False
+    if guest is not None and guest_mode is None:
+        guest_mode = guest
     if guest_mode is None:
         if "--guest" in sys_argv:
             guest_mode = True
@@ -515,6 +519,8 @@ def Driver(
             swiftshader = True
         else:
             swiftshader = False
+    if ad_block is not None and ad_block_on is None:
+        ad_block_on = ad_block
     if ad_block_on is None:
         if "--ad-block" in sys_argv or "--ad_block" in sys_argv:
             ad_block_on = True

seleniumbase/plugins/sb_manager.py

@@ -103,7 +103,9 @@ def SB(
     uc_cdp=None,  # Shortcut / Duplicate of "uc_cdp_events".
     uc_sub=None,  # Shortcut / Duplicate of "uc_subprocess".
     log_cdp=None,  # Shortcut / Duplicate of "log_cdp_events".
+    ad_block=None,  # Shortcut / Duplicate of "ad_block_on".
     server=None,  # Shortcut / Duplicate of "servername".
+    guest=None,  # Shortcut / Duplicate of "guest_mode".
     wire=None,  # Shortcut / Duplicate of "use_wire".
     pls=None,  # Shortcut / Duplicate of "page_load_strategy".
     sjw=None,  # Shortcut / Duplicate of "skip_js_waits".
@@ -296,6 +298,8 @@ def SB(
             incognito = True
         else:
             incognito = False
+    if guest is not None and guest_mode is None:
+        guest_mode = guest
     if guest_mode is None:
         if "--guest" in sys_argv:
             guest_mode = True
@@ -659,6 +663,8 @@ def SB(
             swiftshader = True
         else:
             swiftshader = False
+    if ad_block is not None and ad_block_on is None:
+        ad_block_on = ad_block
     if ad_block_on is None:
         if "--ad-block" in sys_argv or "--ad_block" in sys_argv:
             ad_block_on = True