Skip to content

Commit 7fc6113

Browse files
committed
Merge branch 'use-client-config' of github.com:appium/python-client into use-client-config
2 parents 8139b41 + 5bf6cc6 commit 7fc6113

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

Pipfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pre-commit = "~=4.1"
1010
pytest = "~=8.3"
1111
pytest-cov = "~=5.0"
1212
python-dateutil = "~=2.9"
13-
ruff = "~=0.9.9"
13+
ruff = "~=0.9.10"
1414
tox = "~=4.24"
1515
types-python-dateutil = "~=2.9"
1616

appium/webdriver/webdriver.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
)
2424
from selenium.webdriver.common.by import By
2525
from selenium.webdriver.remote.command import Command as RemoteCommand
26-
from selenium.webdriver.remote.file_detector import FileDetector
2726
from selenium.webdriver.remote.remote_connection import RemoteConnection
2827
from typing_extensions import Self
2928

@@ -179,7 +178,7 @@ def _get_remote_connection_and_client_config(
179178
command_executor: Union[str, AppiumConnection], client_config: Optional[AppiumClientConfig]
180179
) -> tuple[AppiumConnection, Optional[AppiumClientConfig]]:
181180
"""Return the pair of command executor and client config.
182-
If the given command executor is a custome one, returned client config will
181+
If the given command executor is a custom one, returned client config will
183182
be None since the custom command executor has its own client config already.
184183
The custom command executor's one will be prior than the given client config.
185184
"""
@@ -228,7 +227,6 @@ def __init__(
228227
self,
229228
command_executor: Union[str, AppiumConnection] = 'http://127.0.0.1:4723',
230229
extensions: Optional[List['WebDriver']] = None,
231-
file_detector: Optional[FileDetector] = None,
232230
options: Union[AppiumOptions, List[AppiumOptions], None] = None,
233231
client_config: Optional[AppiumClientConfig] = None,
234232
):
@@ -237,7 +235,6 @@ def __init__(
237235
)
238236
super().__init__(
239237
command_executor=command_executor,
240-
file_detector=file_detector,
241238
options=options,
242239
locator_converter=AppiumLocatorConverter(),
243240
web_element_cls=MobileWebElement,

test/unit/webdriver/webdriver_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ def test_get_client_config_and_connection_custom_appium_connection(self):
451451
)
452452

453453
assert isinstance(command_executor, AppiumConnection)
454-
# client config already defined in the command_executor will be userd.
454+
# client config already defined in the command_executor will be used.
455455
assert command_executor._client_config != client_config
456456
assert client_config is None
457457

0 commit comments

Comments
 (0)