[py] Move logic to locator converter

Author: cgoldberg

py/selenium/webdriver/remote/locator_converter.py

@@ -14,6 +14,8 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+
+from selenium.common.exceptions import InvalidSelectorException
 from selenium.webdriver.common.by import By
 
 
@@ -23,6 +25,8 @@ def convert(self, by, value):
         if by == By.ID:
             return By.CSS_SELECTOR, f'[id="{value}"]'
         elif by == By.CLASS_NAME:
+            if value and any(char.isspace() for char in value.strip()):
+                raise InvalidSelectorException("Compound class names are not allowed.")
             return By.CSS_SELECTOR, f".{value}"
         elif by == By.NAME:
             return By.CSS_SELECTOR, f'[name="{value}"]'

py/selenium/webdriver/remote/webdriver.py

@@ -34,7 +34,6 @@
 
 from selenium.common.exceptions import (
     InvalidArgumentException,
-    InvalidSelectorException,
     JavascriptException,
     NoSuchCookieException,
     NoSuchElementException,
@@ -917,10 +916,6 @@ def find_element(self, by=By.ID, value: Optional[str] = None) -> WebElement:
         WebElement
             The first matching `WebElement` found on the page.
         """
-        if by == "class name":
-            if value and any(char.isspace() for char in value.strip()):
-                raise InvalidSelectorException("Compound class names are not allowed.")
-
         by, value = self.locator_converter.convert(by, value)
 
         if isinstance(by, RelativeBy):
@@ -957,10 +952,6 @@ def find_elements(self, by=By.ID, value: Optional[str] = None) -> list[WebElemen
         List[WebElement]
             list of `WebElements` matching locator strategy found on the page.
         """
-        if by == "class name":
-            if value and any(char.isspace() for char in value.strip()):
-                raise InvalidSelectorException("Compound class names are not allowed.")
-
         by, value = self.locator_converter.convert(by, value)
 
         if isinstance(by, RelativeBy):

py/selenium/webdriver/remote/webelement.py

@@ -25,7 +25,7 @@
 from hashlib import md5 as md5_hash
 from io import BytesIO
 
-from selenium.common.exceptions import InvalidSelectorException, JavascriptException, WebDriverException
+from selenium.common.exceptions import JavascriptException, WebDriverException
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.utils import keys_to_typing
 
@@ -598,12 +598,7 @@ def find_element(self, by=By.ID, value=None) -> WebElement:
         WebElement
             The first matching `WebElement` found on the page.
         """
-        if by == "class name":
-            if value and any(char.isspace() for char in value.strip()):
-                raise InvalidSelectorException("Compound class names are not allowed.")
-
         by, value = self._parent.locator_converter.convert(by, value)
-
         return self._execute(Command.FIND_CHILD_ELEMENT, {"using": by, "value": value})["value"]
 
     def find_elements(self, by=By.ID, value=None) -> list[WebElement]:
@@ -632,12 +627,7 @@ def find_elements(self, by=By.ID, value=None) -> list[WebElement]:
         List[WebElement]
             list of `WebElements` matching locator strategy found on the page.
         """
-        if by == "class name":
-            if value and any(char.isspace() for char in value.strip()):
-                raise InvalidSelectorException("Compound class names are not allowed.")
-
         by, value = self._parent.locator_converter.convert(by, value)
-
         return self._execute(Command.FIND_CHILD_ELEMENTS, {"using": by, "value": value})["value"]
 
     def __hash__(self) -> int: