Skip to content
Open
Show file tree
Hide file tree
Changes from 11 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions py/selenium/webdriver/common/by.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

from typing import Literal, Optional

ByType = Literal["id", "xpath", "link text", "partial link text", "name", "tag name", "class name", "css selector"]


class By:
"""Set of supported locator strategies.
Expand Down Expand Up @@ -73,14 +75,14 @@ class By:
>>> element = driver.find_element(By.CSS_SELECTOR, "div.myElement")
"""

ID = "id"
XPATH = "xpath"
LINK_TEXT = "link text"
PARTIAL_LINK_TEXT = "partial link text"
NAME = "name"
TAG_NAME = "tag name"
CLASS_NAME = "class name"
CSS_SELECTOR = "css selector"
ID: ByType = "id"
XPATH: ByType = "xpath"
LINK_TEXT: ByType = "link text"
PARTIAL_LINK_TEXT: ByType = "partial link text"
NAME: ByType = "name"
TAG_NAME: ByType = "tag name"
CLASS_NAME: ByType = "class name"
CSS_SELECTOR: ByType = "css selector"

_custom_finders: dict[str, str] = {}

Expand All @@ -95,6 +97,3 @@ def get_finder(cls, name: str) -> Optional[str]:
@classmethod
def clear_custom_finders(cls) -> None:
cls._custom_finders.clear()


ByType = Literal["id", "xpath", "link text", "partial link text", "name", "tag name", "class name", "css selector"]
3 changes: 2 additions & 1 deletion py/selenium/webdriver/remote/switch_to.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,14 @@ def frame(self, frame_reference: Union[str, int, WebElement]) -> None:
driver.switch_to.frame(driver.find_elements(By.TAG_NAME, "iframe")[0])
"""
if isinstance(frame_reference, str):
frame_name = frame_reference
try:
frame_reference = self._driver.find_element(By.ID, frame_reference)
except NoSuchElementException:
try:
frame_reference = self._driver.find_element(By.NAME, frame_reference)
except NoSuchElementException as exc:
raise NoSuchFrameException(frame_reference) from exc
raise NoSuchFrameException(frame_name) from exc

self._driver.execute(Command.SWITCH_TO_FRAME, {"id": frame_reference})

Expand Down