Removed strict version dependency to selenium

helium/_impl/__init__.py

@@ -1,4 +1,5 @@
 from copy import copy
+from distutils.version import StrictVersion
 from helium._impl.match_type import PREFIX_IGNORE_CASE
 from helium._impl.selenium_wrappers import WebElementWrapper, \
 	WebDriverWrapper, FrameIterator, FramesChangedWhileIterating
@@ -9,10 +10,12 @@
 from inspect import getfullargspec, ismethod, isfunction
 from os import access, X_OK
 from os.path import join, dirname
+import selenium
 from selenium.common.exceptions import UnexpectedAlertPresentException, \
 	ElementNotVisibleException, MoveTargetOutOfBoundsException, \
 	WebDriverException, StaleElementReferenceException, \
 	NoAlertPresentException, NoSuchWindowException
+from selenium.webdriver.common.by import By
 from selenium.webdriver.remote.webelement import WebElement
 from selenium.webdriver.support.wait import WebDriverWait
 from selenium.webdriver.support.ui import Select
@@ -22,6 +25,7 @@
 import atexit
 import re
 
+
 def might_spawn_window(f):
 	def f_decorated(self, *args, **kwargs):
 		driver = self.require_driver()
@@ -787,19 +791,39 @@ def __init__(self, driver, selector, **kwargs):
 	def find_all_in_curr_frame(self):
 		wrap = lambda web_elements: list(map(WebElementWrapper, web_elements))
 		if self.selector.startswith('@'):
-			return wrap(self._driver.find_elements_by_name(self.selector[1:]))
+			if StrictVersion(selenium.__version__) >= StrictVersion('4.0.0'):
+			    _xpath = wrap(self._driver.find_elements(By.NAME, self.selector[1:]))
+			else:
+			    _xpath = wrap(self._driver.find_elements_by_name(self.selector[1:]))			
+			return _xpath
 		if self.selector.startswith('//'):
-			return wrap(self._driver.find_elements_by_xpath(self.selector))
-		return wrap(self._driver.find_elements_by_css_selector(self.selector))
+			if StrictVersion(selenium.__version__) >= StrictVersion('4.0.0'):
+			    _xpath = wrap(self._driver.find_elements(By.XPATH, self.selector))
+			else:
+			    _xpath = wrap(self._driver.find_elements_by_xpath(self.selector))
+			return _xpath
+		if StrictVersion(selenium.__version__) >= StrictVersion('4.0.0'):
+		    _xpath = wrap(self._driver.find_elements(By.CSS_SELECTOR, self.selector))
+		else:
+		    _xpath = wrap(self._driver.find_elements_by_css_selector(self.selector))
+		return _xpath
 
 class HTMLElementIdentifiedByXPath(HTMLElementImpl):
 	def find_all_in_curr_frame(self):
 		x_path = self.get_xpath()
-		return self._sort_search_result(
+		if StrictVersion(selenium.__version__) >= StrictVersion('4.0.0'):
+		    _xpath = self._sort_search_result(
 			list(map(
-				WebElementWrapper, self._driver.find_elements_by_xpath(x_path)
+				WebElementWrapper, self._driver.find_elements(By.XPATH, x_path)
 			))
 		)
+		else:
+		    _xpath = self._sort_search_result(
+			list(map(
+				WebElementWrapper, self._driver.find_elements_by_xpath(x_path)
+			))
+		)		
+		return _xpath
 	def _sort_search_result(self, search_result):
 		keys_to_result_items = []
 		for web_elt in search_result:
@@ -939,9 +963,15 @@ def find_all_in_curr_frame(self):
 	def _find_elts(self, xpath=None):
 		if xpath is None:
 			xpath = self.get_xpath()
-		return list(map(
+		if StrictVersion(selenium.__version__) >= StrictVersion('4.0.0'):
+		    _xpath = list(map(
+			WebElementWrapper, self._driver.find_elements(By.XPATH, xpath)
+		    ))
+		else:
+		    _xpath = list(map(
 			WebElementWrapper, self._driver.find_elements_by_xpath(xpath)
-		))
+		    ))
+		return _xpath
 	def _find_elts_by_free_text(self):
 		elt_types = [
 			xpath.strip().lstrip('/') for xpath in self.get_xpath().split('|')

helium/_impl/selenium_wrappers.py

@@ -1,10 +1,13 @@
+from distutils.version import StrictVersion
 from helium._impl.util.geom import Rectangle
 from selenium.common.exceptions import StaleElementReferenceException, \
 	NoSuchFrameException, WebDriverException
+import selenium
 from selenium.webdriver.common.action_chains import ActionChains
 from urllib.error import URLError
 import sys
 
+
 class Wrapper:
 	def __init__(self, target):
 		self.target = target
@@ -38,15 +41,21 @@ def get_distance_to_last_manipulated(self, web_element):
 			# No .location. This happens when last_manipulated_element is an
 			# Alert or a Window.
 			return 0
-	def find_elements_by_name(self, name):
-		# Selenium sometimes returns None. For robustness, we turn this into []:
-		return self.target.find_elements_by_name(name) or []
-	def find_elements_by_xpath(self, xpath):
-		# Selenium sometimes returns None. For robustness, we turn this into []:
-		return self.target.find_elements_by_xpath(xpath) or []
-	def find_elements_by_css_selector(self, selector):
-		# Selenium sometimes returns None. For robustness, we turn this into []:
-		return self.target.find_elements_by_css_selector(selector) or []
+	# Compare the version with '4.0.0'
+	if StrictVersion(selenium.__version__) >= StrictVersion('4.0.0'):
+		def find_elements(self, by, xpath):
+			# Selenium sometimes returns None. For robustness, we turn this into []:
+			return self.target.find_elements(by, xpath) or []
+	else:
+		def find_elements_by_name(self, name):
+			# Selenium sometimes returns None. For robustness, we turn this into []:
+			return self.target.find_elements_by_name(name) or []
+		def find_elements_by_xpath(self, xpath):
+			# Selenium sometimes returns None. For robustness, we turn this into []:
+			return self.target.find_elements_by_xpath(xpath) or []
+		def find_elements_by_css_selector(self, selector):
+			# Selenium sometimes returns None. For robustness, we turn this into []:
+			return self.target.find_elements_by_css_selector(selector) or []
 	def is_firefox(self):
 		return self.browser_name == 'firefox'
 	@property
@@ -166,4 +175,4 @@ def switch_to_frame(self, frame_index_path):
 			self.driver.switch_to.frame(frame_index)
 
 class FramesChangedWhileIterating(Exception):
-	pass
+	pass

setup.py

@@ -13,7 +13,7 @@
 	packages = find_packages(exclude=['tests', 'tests.*']),
 	install_requires = [
 		# Also update requirements/base.txt when you make changes here.
-		'selenium==3.141.0'
+		'selenium>=3.141.0'
 	],
 	package_data = {
 		'helium._impl': ['webdrivers/**/*']
@@ -37,4 +37,4 @@
 		'Operating System :: MacOS :: MacOS X'
 	],
 	test_suite='tests'
-)
+)