Refactor imports for exception-handling

Author: mdmintz

seleniumbase/fixtures/js_utils.py

@@ -5,6 +5,7 @@
 import re
 import requests
 import time
+from selenium.common.exceptions import NoSuchElementException
 from selenium.common.exceptions import WebDriverException
 from seleniumbase import config as sb_config
 from seleniumbase.common import decorators
@@ -214,8 +215,7 @@ def wait_for_css_query_selector(
             if now_ms >= stop_ms:
                 break
             time.sleep(0.1)
-
-    raise Exception(
+    raise NoSuchElementException(
         "Element {%s} was not present after %s seconds!" % (
             selector, timeout))
 

seleniumbase/fixtures/page_actions.py

@@ -23,15 +23,15 @@
 import os
 import sys
 import time
+from selenium.common.exceptions import ElementNotVisibleException
+from selenium.common.exceptions import NoAlertPresentException
+from selenium.common.exceptions import NoSuchElementException
+from selenium.common.exceptions import NoSuchFrameException
+from selenium.common.exceptions import NoSuchWindowException
 from selenium.common.exceptions import StaleElementReferenceException
 from selenium.common import exceptions as selenium_exceptions
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.action_chains import ActionChains
-from selenium.webdriver.remote.errorhandler import ElementNotVisibleException
-from selenium.webdriver.remote.errorhandler import NoSuchElementException
-from selenium.webdriver.remote.errorhandler import NoAlertPresentException
-from selenium.webdriver.remote.errorhandler import NoSuchFrameException
-from selenium.webdriver.remote.errorhandler import NoSuchWindowException
 from seleniumbase.config import settings
 from seleniumbase.fixtures import shared_utils as s_utils
 ENI_Exception = selenium_exceptions.ElementNotInteractableException

seleniumbase/fixtures/shared_utils.py

@@ -2,11 +2,11 @@
 This module contains shared utility methods.
 """
 import time
-from selenium.webdriver.remote.errorhandler import ElementNotVisibleException
-from selenium.webdriver.remote.errorhandler import NoSuchElementException
-from selenium.webdriver.remote.errorhandler import NoAlertPresentException
-from selenium.webdriver.remote.errorhandler import NoSuchFrameException
-from selenium.webdriver.remote.errorhandler import NoSuchWindowException
+from selenium.common.exceptions import ElementNotVisibleException
+from selenium.common.exceptions import NoAlertPresentException
+from selenium.common.exceptions import NoSuchElementException
+from selenium.common.exceptions import NoSuchFrameException
+from selenium.common.exceptions import NoSuchWindowException
 from seleniumbase.common.exceptions import NoSuchFileException
 from seleniumbase.common.exceptions import TimeLimitExceededException
 from seleniumbase import config as sb_config

seleniumbase/masterqa/master_qa.py

@@ -2,8 +2,8 @@
 import shutil
 import sys
 import time
+from selenium.common.exceptions import NoAlertPresentException
 from selenium.common.exceptions import WebDriverException
-from selenium.webdriver.remote.errorhandler import NoAlertPresentException
 from seleniumbase import BaseCase
 from seleniumbase.core.style_sheet import style
 from seleniumbase.config import settings