address review comments

Author: navin772

py/selenium/webdriver/remote/remote_connection.py

@@ -143,9 +143,13 @@ class RemoteConnection:
     )
     _ca_certs = os.getenv("REQUESTS_CA_BUNDLE") if "REQUESTS_CA_BUNDLE" in os.environ else certifi.where()
 
+    system = platform.system().lower()
+    if system == "darwin":
+        system = "mac"
+
     # Class variables for headers
     extra_headers = None
-    user_agent = f"selenium/{__version__} (python {platform.system().lower()})"
+    user_agent = f"selenium/{__version__} (python {system}"
 
     @classmethod
     def get_timeout(cls):
@@ -200,14 +204,10 @@ def get_remote_connection_headers(cls, parsed_url, keep_alive=False):
          - keep_alive (Boolean) - Is this a keep-alive connection (default: False)
         """
 
-        system = platform.system().lower()
-        if system == "darwin":
-            system = "mac"
-
         headers = {
             "Accept": "application/json",
             "Content-Type": "application/json;charset=UTF-8",
-            "User-Agent": f"selenium/{__version__} (python {system})",
+            "User-Agent": cls.user_agent,
         }
 
         if parsed_url.username:
@@ -241,8 +241,9 @@ def _separate_http_proxy_auth(self):
         proxy_without_auth = protocol + no_protocol[len(auth) + 1 :]
         return proxy_without_auth, auth
 
-    def _get_connection_manager(self):
+    def _get_connection_manager(self, **pool_manager_kwargs):
         pool_manager_init_args = {"timeout": self.get_timeout()}
+        pool_manager_init_args.update(pool_manager_kwargs.get("init_args_for_pool_manager", {}))
 
         if self._ignore_certificates:
             pool_manager_init_args["cert_reqs"] = "CERT_NONE"

py/selenium/webdriver/remote/webdriver.py

@@ -186,6 +186,7 @@ def __init__(
          - file_detector - Pass custom file detector object during instantiation. If None,
              then default LocalFileDetector() will be used.
          - options - instance of a driver options.Options class
+         - locator_converter - Custom locator converter to use. Defaults to None.
          - web_element_cls - Custom class to use for web elements. Defaults to WebElement.
         """
 

py/selenium/webdriver/remote/webelement.py

@@ -404,16 +404,7 @@ def find_element(self, by=By.ID, value=None) -> WebElement:
 
         :rtype: WebElement
         """
-        if by == By.ID:
-            by = By.CSS_SELECTOR
-            value = f'[id="{value}"]'
-        elif by == By.CLASS_NAME:
-            by = By.CSS_SELECTOR
-            value = f".{value}"
-        elif by == By.NAME:
-            by = By.CSS_SELECTOR
-            value = f'[name="{value}"]'
-
+        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]:
@@ -426,16 +417,7 @@ def find_elements(self, by=By.ID, value=None) -> List[WebElement]:
 
         :rtype: list of WebElement
         """
-        if by == By.ID:
-            by = By.CSS_SELECTOR
-            value = f'[id="{value}"]'
-        elif by == By.CLASS_NAME:
-            by = By.CSS_SELECTOR
-            value = f".{value}"
-        elif by == By.NAME:
-            by = By.CSS_SELECTOR
-            value = f'[name="{value}"]'
-
+        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:

py/test/unit/selenium/webdriver/remote/remote_connection_tests.py

@@ -55,7 +55,7 @@ def test_get_remote_connection_headers_defaults():
     assert headers.get("Accept") == "application/json"
     assert headers.get("Content-Type") == "application/json;charset=UTF-8"
     assert headers.get("User-Agent").startswith(f"selenium/{__version__} (python ")
-    assert headers.get("User-Agent").split(" ")[-1] in {"windows)", "mac)", "linux)"}
+    assert headers.get("User-Agent").split(" ")[-1] in {"windows)", "mac)", "linux)", "mac", "windows", "linux"}
 
 
 def test_get_remote_connection_headers_adds_auth_header_if_pass():
@@ -301,3 +301,13 @@ def test_get_connection_manager_ignores_certificates(monkeypatch):
     assert conn.connection_pool_kw["timeout"] == 10
     assert conn.connection_pool_kw["cert_reqs"] == "CERT_NONE"
     assert isinstance(conn, urllib3.PoolManager)
+
+
+def test_get_connection_manager_with_custom_args():
+    custom_args = {"retries": 3, "block": True}
+    remote_connection = RemoteConnection("http://remote", keep_alive=False)
+    conn = remote_connection._get_connection_manager(init_args_for_pool_manager=custom_args)
+
+    assert isinstance(conn, urllib3.PoolManager)
+    assert conn.connection_pool_kw["retries"] == 3
+    assert conn.connection_pool_kw["block"] is True