Refactor some code

Author: mdmintz

seleniumbase/fixtures/shared_utils.py

@@ -8,15 +8,15 @@
 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
 
 
 def format_exc(exception, message):
     """
     Formats an exception message to make the output cleaner.
     """
+    from seleniumbase.common.exceptions import NoSuchFileException
+
     if exception == Exception:
         exc = Exception
         return exc, message
@@ -65,6 +65,8 @@ def _format_message(message):
 
 
 def __time_limit_exceeded(message):
+    from seleniumbase.common.exceptions import TimeLimitExceededException
+
     raise TimeLimitExceededException(message)
 
 

seleniumbase/plugins/pytest_plugin.py

@@ -8,9 +8,6 @@
 import time
 from seleniumbase import config as sb_config
 from seleniumbase.config import settings
-from seleniumbase.core import download_helper
-from seleniumbase.core import log_helper
-from seleniumbase.core import proxy_helper
 from seleniumbase.fixtures import constants
 
 pytest_plugins = ["pytester"]  # Adds the "testdir" fixture
@@ -1166,8 +1163,11 @@ def pytest_configure(config):
         else:
             pass  # Use the browser specified using "--browser=BROWSER"
 
-    if sb_config.with_testing_base:
-        log_helper.log_folder_setup(sb_config.log_path, sb_config.archive_logs)
+    from seleniumbase.core import log_helper
+    from seleniumbase.core import download_helper
+    from seleniumbase.core import proxy_helper
+
+    log_helper.log_folder_setup(sb_config.log_path, sb_config.archive_logs)
     download_helper.reset_downloads_folder()
     proxy_helper.remove_proxy_zip_if_present()
 
@@ -1346,6 +1346,9 @@ def pytest_terminal_summary(terminalreporter):
 
 
 def _perform_pytest_unconfigure_():
+    from seleniumbase.core import log_helper
+    from seleniumbase.core import proxy_helper
+
     proxy_helper.remove_proxy_zip_if_present()
     if hasattr(sb_config, "reuse_session") and sb_config.reuse_session:
         # Close the shared browser session