Refactoring

Author: mdmintz

seleniumbase/core/browser_launcher.py

@@ -9,7 +9,6 @@
 import time
 import urllib3
 import warnings
-from importlib.util import find_spec
 from selenium import webdriver
 from selenium.webdriver.chrome.service import Service as ChromeService
 from selenium.webdriver.edge.service import Service as EdgeService
@@ -1239,12 +1238,14 @@ def get_remote_driver(
         pip_find_lock = fasteners.InterProcessLock(
             constants.PipInstall.FINDLOCK
         )
-        with pip_find_lock:  # Prevent multi-processes mode issues
-            if not find_spec("selenium-wire"):
+        with pip_find_lock:
+            try:
+                from seleniumwire import webdriver
+            except Exception:
                 shared_utils.pip_install(
                     "selenium-wire", version=constants.SeleniumWire.VER
                 )
-        from seleniumwire import webdriver
+                from seleniumwire import webdriver
     else:
         from selenium import webdriver
 

seleniumbase/core/mysql.py

@@ -9,7 +9,6 @@ def __init__(self, database_env="test", conf_creds=None):
         import fasteners
         import sys
         import time
-        from importlib.util import find_spec
         from seleniumbase import config as sb_config
         from seleniumbase.config import settings
         from seleniumbase.core import settings_parser
@@ -19,14 +18,15 @@ def __init__(self, database_env="test", conf_creds=None):
         pip_find_lock = fasteners.InterProcessLock(
             constants.PipInstall.FINDLOCK
         )
-        with pip_find_lock:  # Prevent multi-processes mode issues
-            if not find_spec("pymysql"):
+        with pip_find_lock:
+            try:
+                import pymysql
+            except Exception:
                 if sys.version_info >= (3, 6):
                     shared_utils.pip_install("pymysql", version="1.0.2")
                 else:
                     shared_utils.pip_install("pymysql", version="0.10.1")
-        import pymysql
-
+                import pymysql
         db_server = settings.DB_HOST
         db_port = settings.DB_PORT
         db_user = settings.DB_USERNAME

seleniumbase/core/s3_manager.py

@@ -16,18 +16,18 @@ def __init__(
         selenium_secret_key=settings.S3_SELENIUM_SECRET_KEY,
     ):
         import fasteners
-        from importlib.util import find_spec
         from seleniumbase.fixtures import constants
         from seleniumbase.fixtures import shared_utils
 
         pip_find_lock = fasteners.InterProcessLock(
             constants.PipInstall.FINDLOCK
         )
-        with pip_find_lock:  # Prevent multi-processes mode issues
-            if not find_spec("boto"):
+        with pip_find_lock:
+            try:
+                from boto.s3.connection import S3Connection
+            except Exception:
                 shared_utils.pip_install("boto", version="2.49.0")
-        from boto.s3.connection import S3Connection
-
+                from boto.s3.connection import S3Connection
         self.conn = S3Connection(selenium_access_key, selenium_secret_key)
         self.bucket = self.conn.get_bucket(log_bucket)
         self.bucket_url = bucket_url

seleniumbase/fixtures/base_case.py

@@ -45,7 +45,6 @@ def test_anything(self):
 import unittest
 import urllib3
 from contextlib import contextmanager
-from importlib.util import find_spec
 from selenium.common.exceptions import (
     ElementClickInterceptedException as ECI_Exception,
     ElementNotInteractableException as ENI_Exception,
@@ -2914,7 +2913,7 @@ def switch_to_frame(self, frame, timeout=None):
         if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
             timeout = self.__get_new_timeout(timeout)
         if self.__needs_minimum_wait():
-            time.sleep(0.03)
+            time.sleep(0.035)
         if type(frame) is str and self.is_element_visible(frame):
             try:
                 self.scroll_to(frame, timeout=1)
@@ -2945,11 +2944,11 @@ def switch_to_frame(self, frame, timeout=None):
                         return
         self.wait_for_ready_state_complete()
         if self.__needs_minimum_wait():
-            time.sleep(0.03)
+            time.sleep(0.035)
         page_actions.switch_to_frame(self.driver, frame, timeout)
         self.wait_for_ready_state_complete()
         if self.__needs_minimum_wait():
-            time.sleep(0.01)
+            time.sleep(0.015)
 
     def switch_to_default_content(self):
         """Brings driver control outside the current iframe.
@@ -5903,11 +5902,12 @@ def get_pdf_text(
             pip_find_lock = fasteners.InterProcessLock(
                 constants.PipInstall.FINDLOCK
             )
-            with pip_find_lock:  # Prevent multi-processes mode issues
-                if not find_spec("pdfminer.six"):
+            with pip_find_lock:
+                try:
+                    from pdfminer.high_level import extract_text
+                except Exception:
                     shared_utils.pip_install("pdfminer.six")
-            from pdfminer.high_level import extract_text
-
+                    from pdfminer.high_level import extract_text
         if not password:
             password = ""
         if not maxpages: