Appium-Python-Client 4.2.1__tar.gz → 4.4.0__tar.gz

{appium_python_client-4.2.1 → appium_python_client-4.4.0}/Appium_Python_Client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Appium-Python-Client
-Version: 4.2.1
+Version: 4.4.0
 Summary: Python client for Appium
 Home-page: http://appium.io/
 Author: Isaac Murchie
@@ -25,7 +25,7 @@ Classifier: Topic :: Software Development :: Quality Assurance
 Classifier: Topic :: Software Development :: Testing
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: selenium<4.26,~=4.12
+Requires-Dist: selenium<5.0,~=4.26
 
 # Appium Python Client
 
@@ -70,6 +70,7 @@ download and unarchive the source tarball (Appium-Python-Client-X.X.tar.gz).
 
 |Appium Python Client| Selenium binding| Python version |
 |----|----|----|
+|`4.3.0`+ |`4.26.0`+ | 3.8+ |
 |`3.0.0` - `4.2.1` |`4.12.0` - `4.25.0` | 3.8+ |
 |`2.10.0` - `2.11.1` |`4.1.0` - `4.11.2` | 3.7+ |
 |`2.2.0` - `2.9.0` |`4.1.0` - `4.9.0` | 3.7+ |
@@ -340,6 +341,21 @@ options.set_capability('browser_name', 'safari')
 driver = webdriver.Remote('http://127.0.0.1:4723', options=options, strict_ssl=False)
 ```
 
+Since Appium Python client v4.3.0, we recommend using `selenium.webdriver.remote.client_config.ClientConfig`
+instead of giving `strict_ssl` as an argument of `webdriver.Remote` below to configure the validation.
+
+```python
+from appium import webdriver
+
+from selenium.webdriver.remote.client_config import ClientConfig
+
+client_config = ClientConfig(
+    remote_server_addr='http://127.0.0.1:4723',
+    ignore_certificates=True
+)
+driver = webdriver.Remote(client_config.remote_server_addr, options=options, client_config=client_config)
+```
+
 ## Set custom `AppiumConnection`
 
 The first argument of `webdriver.Remote` can set an arbitrary command executor for you.
@@ -393,6 +409,18 @@ driver = webdriver.Remote(custom_executor, options=options)
 
 ```
 
+The `AppiumConnection` can set `selenium.webdriver.remote.client_config.ClientConfig` as well.
+
+## Relaxing HTTP request read timeout
+
+Appium Python Client has `120` seconds read timeout on each HTTP request since the version v4.3.0 because of
+the corresponding selenium binding version.
+You have two methods to extend the read timeout.
+
+1. Set `GLOBAL_DEFAULT_TIMEOUT` environment variable
+2. Configure timeout via `selenium.webdriver.remote.client_config.ClientConfig`
+    - `timeout` argument, or
+    - `init_args_for_pool_manager` argument for `urllib3.PoolManager`
 
 ## Documentation
 

{appium_python_client-4.2.1 → appium_python_client-4.4.0}/Appium_Python_Client.egg-info/SOURCES.txt

@@ -286,6 +286,7 @@ appium/webdriver/clipboard_content_type.py
 appium/webdriver/command_method.py
 appium/webdriver/connectiontype.py
 appium/webdriver/errorhandler.py
+appium/webdriver/locator_converter.py
 appium/webdriver/mobilecommand.py
 appium/webdriver/switch_to.py
 appium/webdriver/webdriver.py

appium_python_client-4.4.0/Appium_Python_Client.egg-info/requires.txt

@@ -0,0 +1 @@
+selenium<5.0,~=4.26

{appium_python_client-4.2.1 → appium_python_client-4.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Appium-Python-Client
-Version: 4.2.1
+Version: 4.4.0
 Summary: Python client for Appium
 Home-page: http://appium.io/
 Author: Isaac Murchie
@@ -25,7 +25,7 @@ Classifier: Topic :: Software Development :: Quality Assurance
 Classifier: Topic :: Software Development :: Testing
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: selenium<4.26,~=4.12
+Requires-Dist: selenium<5.0,~=4.26
 
 # Appium Python Client
 
@@ -70,6 +70,7 @@ download and unarchive the source tarball (Appium-Python-Client-X.X.tar.gz).
 
 |Appium Python Client| Selenium binding| Python version |
 |----|----|----|
+|`4.3.0`+ |`4.26.0`+ | 3.8+ |
 |`3.0.0` - `4.2.1` |`4.12.0` - `4.25.0` | 3.8+ |
 |`2.10.0` - `2.11.1` |`4.1.0` - `4.11.2` | 3.7+ |
 |`2.2.0` - `2.9.0` |`4.1.0` - `4.9.0` | 3.7+ |
@@ -340,6 +341,21 @@ options.set_capability('browser_name', 'safari')
 driver = webdriver.Remote('http://127.0.0.1:4723', options=options, strict_ssl=False)
 ```
 
+Since Appium Python client v4.3.0, we recommend using `selenium.webdriver.remote.client_config.ClientConfig`
+instead of giving `strict_ssl` as an argument of `webdriver.Remote` below to configure the validation.
+
+```python
+from appium import webdriver
+
+from selenium.webdriver.remote.client_config import ClientConfig
+
+client_config = ClientConfig(
+    remote_server_addr='http://127.0.0.1:4723',
+    ignore_certificates=True
+)
+driver = webdriver.Remote(client_config.remote_server_addr, options=options, client_config=client_config)
+```
+
 ## Set custom `AppiumConnection`
 
 The first argument of `webdriver.Remote` can set an arbitrary command executor for you.
@@ -393,6 +409,18 @@ driver = webdriver.Remote(custom_executor, options=options)
 
 ```
 
+The `AppiumConnection` can set `selenium.webdriver.remote.client_config.ClientConfig` as well.
+
+## Relaxing HTTP request read timeout
+
+Appium Python Client has `120` seconds read timeout on each HTTP request since the version v4.3.0 because of
+the corresponding selenium binding version.
+You have two methods to extend the read timeout.
+
+1. Set `GLOBAL_DEFAULT_TIMEOUT` environment variable
+2. Configure timeout via `selenium.webdriver.remote.client_config.ClientConfig`
+    - `timeout` argument, or
+    - `init_args_for_pool_manager` argument for `urllib3.PoolManager`
 
 ## Documentation
 

{appium_python_client-4.2.1 → appium_python_client-4.4.0}/README.md

@@ -41,6 +41,7 @@ download and unarchive the source tarball (Appium-Python-Client-X.X.tar.gz).
 
 |Appium Python Client| Selenium binding| Python version |
 |----|----|----|
+|`4.3.0`+ |`4.26.0`+ | 3.8+ |
 |`3.0.0` - `4.2.1` |`4.12.0` - `4.25.0` | 3.8+ |
 |`2.10.0` - `2.11.1` |`4.1.0` - `4.11.2` | 3.7+ |
 |`2.2.0` - `2.9.0` |`4.1.0` - `4.9.0` | 3.7+ |
@@ -311,6 +312,21 @@ options.set_capability('browser_name', 'safari')
 driver = webdriver.Remote('http://127.0.0.1:4723', options=options, strict_ssl=False)
 ```
 
+Since Appium Python client v4.3.0, we recommend using `selenium.webdriver.remote.client_config.ClientConfig`
+instead of giving `strict_ssl` as an argument of `webdriver.Remote` below to configure the validation.
+
+```python
+from appium import webdriver
+
+from selenium.webdriver.remote.client_config import ClientConfig
+
+client_config = ClientConfig(
+    remote_server_addr='http://127.0.0.1:4723',
+    ignore_certificates=True
+)
+driver = webdriver.Remote(client_config.remote_server_addr, options=options, client_config=client_config)
+```
+
 ## Set custom `AppiumConnection`
 
 The first argument of `webdriver.Remote` can set an arbitrary command executor for you.
@@ -364,6 +380,18 @@ driver = webdriver.Remote(custom_executor, options=options)
 
 ```
 
+The `AppiumConnection` can set `selenium.webdriver.remote.client_config.ClientConfig` as well.
+
+## Relaxing HTTP request read timeout
+
+Appium Python Client has `120` seconds read timeout on each HTTP request since the version v4.3.0 because of
+the corresponding selenium binding version.
+You have two methods to extend the read timeout.
+
+1. Set `GLOBAL_DEFAULT_TIMEOUT` environment variable
+2. Configure timeout via `selenium.webdriver.remote.client_config.ClientConfig`
+    - `timeout` argument, or
+    - `init_args_for_pool_manager` argument for `urllib3.PoolManager`
 
 ## Documentation
 

appium_python_client-4.4.0/appium/version.py

@@ -0,0 +1 @@
+version = '4.4.0'

appium_python_client-4.4.0/appium/webdriver/appium_connection.py

@@ -0,0 +1,64 @@
+#!/usr/bin/env python
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import uuid
+from typing import TYPE_CHECKING, Any, Dict
+
+from selenium.webdriver.remote.remote_connection import RemoteConnection
+
+from appium.common.helper import library_version
+
+if TYPE_CHECKING:
+    from urllib.parse import ParseResult
+
+
+PREFIX_HEADER = 'appium/'
+
+HEADER_IDEMOTENCY_KEY = 'X-Idempotency-Key'
+
+
+def _get_new_headers(key: str, headers: Dict[str, str]) -> Dict[str, str]:
+    """Return a new dictionary of heafers without the given key.
+    The key match is case-insensitive."""
+    lower_key = key.lower()
+    return {k: v for k, v in headers.items() if k.lower() != lower_key}
+
+
+class AppiumConnection(RemoteConnection):
+    """
+    A subclass of selenium.webdriver.remote.remote_connection.Remoteconnection.
+
+    The changes are:
+        - The default user agent
+        - Adds 'X-Idempotency-Key' header in a new session request to avoid proceeding
+          the same request multiple times in the Appium server side.
+            - https://github.com/appium/appium-base-driver/pull/400
+    """
+
+    user_agent = f'{PREFIX_HEADER}{library_version()} ({RemoteConnection.user_agent})'
+    extra_headers = {}
+
+    @classmethod
+    def get_remote_connection_headers(cls, parsed_url: 'ParseResult', keep_alive: bool = True) -> Dict[str, Any]:
+        """Override get_remote_connection_headers in RemoteConnection to control the extra headers.
+        This method will be used in sending a request method in this class.
+        """
+
+        if parsed_url.path.endswith('/session'):
+            # https://github.com/appium/appium-base-driver/pull/400
+            cls.extra_headers[HEADER_IDEMOTENCY_KEY] = str(uuid.uuid4())
+        else:
+            cls.extra_headers = _get_new_headers(HEADER_IDEMOTENCY_KEY, cls.extra_headers)
+
+        return {**super().get_remote_connection_headers(parsed_url, keep_alive=keep_alive), **cls.extra_headers}

{appium_python_client-4.2.1 → appium_python_client-4.4.0}/appium/webdriver/common/appiumby.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from typing import Literal
+
 from selenium.webdriver.common.by import By
 
 
@@ -32,3 +34,20 @@ class AppiumBy(By):
     FLUTTER_INTEGRATION_KEY = '-flutter key'
     FLUTTER_INTEGRATION_TEXT = '-flutter text'
     FLUTTER_INTEGRATION_TEXT_CONTAINING = '-flutter text containing'
+
+
+ByType = Literal[
+    '-ios predicate string',
+    '-ios class chain',
+    '-android uiautomator',
+    '-android viewtag',
+    '-android datamatcher',
+    '-android viewmatcher',
+    'accessibility id',
+    '-image',
+    '-custom',
+    '-flutter semantics label',
+    '-flutter type',
+    '-flutter key',
+    '-flutter text containing',
+]

{appium_python_client-4.2.1 → appium_python_client-4.4.0}/appium/webdriver/extensions/android/activities.py

@@ -56,9 +56,8 @@ class Activities(CanExecuteCommands, CanExecuteScripts, CanRememberExtensionPres
             return False
 
     def _add_commands(self) -> None:
-        # noinspection PyProtectedMember,PyUnresolvedReferences
-        commands = self.command_executor._commands
-        commands[Command.GET_CURRENT_ACTIVITY] = (
+        self.command_executor.add_command(
+            Command.GET_CURRENT_ACTIVITY,
             'GET',
             '/session/$sessionId/appium/device/current_activity',
         )

{appium_python_client-4.2.1 → appium_python_client-4.4.0}/appium/webdriver/extensions/android/common.py

@@ -47,13 +47,13 @@ class Common(CanExecuteCommands, CanExecuteScripts, CanRememberExtensionPresence
             return self.mark_extension_absence(ext_name).execute(Command.GET_CURRENT_PACKAGE)['value']
 
     def _add_commands(self) -> None:
-        # noinspection PyProtectedMember,PyUnresolvedReferences
-        commands = self.command_executor._commands
-        commands[Command.GET_CURRENT_PACKAGE] = (
+        self.command_executor.add_command(
+            Command.GET_CURRENT_PACKAGE,
             'GET',
             '/session/$sessionId/appium/device/current_package',
         )
-        commands[Command.OPEN_NOTIFICATIONS] = (
+        self.command_executor.add_command(
+            Command.OPEN_NOTIFICATIONS,
             'POST',
             '/session/$sessionId/appium/device/open_notifications',
         )

{appium_python_client-4.2.1 → appium_python_client-4.4.0}/appium/webdriver/extensions/android/display.py

@@ -41,9 +41,8 @@ class Display(CanExecuteCommands, CanExecuteScripts, CanRememberExtensionPresenc
             return self.mark_extension_absence(ext_name).execute(Command.GET_DISPLAY_DENSITY)['value']
 
     def _add_commands(self) -> None:
-        # noinspection PyProtectedMember,PyUnresolvedReferences
-        commands = self.command_executor._commands
-        commands[Command.GET_DISPLAY_DENSITY] = (
+        self.command_executor.add_command(
+            Command.GET_DISPLAY_DENSITY,
             'GET',
             '/session/$sessionId/appium/device/display_density',
         )

{appium_python_client-4.2.1 → appium_python_client-4.4.0}/appium/webdriver/extensions/android/gsm.py

@@ -142,11 +142,6 @@ class Gsm(CanExecuteCommands, CanExecuteScripts, CanRememberExtensionPresence):
         return self
 
     def _add_commands(self) -> None:
-        # noinspection PyProtectedMember,PyUnresolvedReferences
-        commands = self.command_executor._commands
-        commands[Command.MAKE_GSM_CALL] = ('POST', '/session/$sessionId/appium/device/gsm_call')
-        commands[Command.SET_GSM_SIGNAL] = (
-            'POST',
-            '/session/$sessionId/appium/device/gsm_signal',
-        )
-        commands[Command.SET_GSM_VOICE] = ('POST', '/session/$sessionId/appium/device/gsm_voice')
+        self.command_executor.add_command(Command.MAKE_GSM_CALL, 'POST', '/session/$sessionId/appium/device/gsm_call')
+        self.command_executor.add_command(Command.SET_GSM_SIGNAL, 'POST', '/session/$sessionId/appium/device/gsm_signal')
+        self.command_executor.add_command(Command.SET_GSM_VOICE, 'POST', '/session/$sessionId/appium/device/gsm_voice')

{appium_python_client-4.2.1 → appium_python_client-4.4.0}/appium/webdriver/extensions/android/network.py

@@ -157,18 +157,19 @@ class Network(CanExecuteCommands, CanExecuteScripts, CanRememberExtensionPresenc
         return self
 
     def _add_commands(self) -> None:
-        # noinspection PyProtectedMember,PyUnresolvedReferences
-        commands = self.command_executor._commands
-        commands[Command.TOGGLE_WIFI] = ('POST', '/session/$sessionId/appium/device/toggle_wifi')
-        commands[Command.GET_NETWORK_CONNECTION] = (
+        self.command_executor.add_command(Command.TOGGLE_WIFI, 'POST', '/session/$sessionId/appium/device/toggle_wifi')
+        self.command_executor.add_command(
+            Command.GET_NETWORK_CONNECTION,
             'GET',
             '/session/$sessionId/network_connection',
         )
-        commands[Command.SET_NETWORK_CONNECTION] = (
+        self.command_executor.add_command(
+            Command.SET_NETWORK_CONNECTION,
             'POST',
             '/session/$sessionId/network_connection',
         )
-        commands[Command.SET_NETWORK_SPEED] = (
+        self.command_executor.add_command(
+            Command.SET_NETWORK_SPEED,
             'POST',
             '/session/$sessionId/appium/device/network_speed',
         )

{appium_python_client-4.2.1 → appium_python_client-4.4.0}/appium/webdriver/extensions/android/performance.py

@@ -73,13 +73,13 @@ class Performance(CanExecuteCommands, CanExecuteScripts, CanRememberExtensionPre
             return self.mark_extension_absence(ext_name).execute(Command.GET_PERFORMANCE_DATA_TYPES)['value']
 
     def _add_commands(self) -> None:
-        # noinspection PyProtectedMember,PyUnresolvedReferences
-        commands = self.command_executor._commands
-        commands[Command.GET_PERFORMANCE_DATA] = (
+        self.command_executor.add_command(
+            Command.GET_PERFORMANCE_DATA,
             'POST',
             '/session/$sessionId/appium/getPerformanceData',
         )
-        commands[Command.GET_PERFORMANCE_DATA_TYPES] = (
+        self.command_executor.add_command(
+            Command.GET_PERFORMANCE_DATA_TYPES,
             'POST',
             '/session/$sessionId/appium/performanceData/types',
         )

{appium_python_client-4.2.1 → appium_python_client-4.4.0}/appium/webdriver/extensions/android/power.py

@@ -72,10 +72,9 @@ class Power(CanExecuteCommands, CanExecuteScripts, CanRememberExtensionPresence)
         return self
 
     def _add_commands(self) -> None:
-        # noinspection PyProtectedMember,PyUnresolvedReferences
-        commands = self.command_executor._commands
-        commands[Command.SET_POWER_CAPACITY] = (
+        self.command_executor.add_command(
+            Command.SET_POWER_CAPACITY,
             'POST',
             '/session/$sessionId/appium/device/power_capacity',
         )
-        commands[Command.SET_POWER_AC] = ('POST', '/session/$sessionId/appium/device/power_ac')
+        self.command_executor.add_command(Command.SET_POWER_AC, 'POST', '/session/$sessionId/appium/device/power_ac')

{appium_python_client-4.2.1 → appium_python_client-4.4.0}/appium/webdriver/extensions/android/sms.py

@@ -47,6 +47,4 @@ class Sms(CanExecuteCommands, CanExecuteScripts, CanRememberExtensionPresence):
         return self
 
     def _add_commands(self) -> None:
-        # noinspection PyProtectedMember,PyUnresolvedReferences
-        commands = self.command_executor._commands
-        commands[Command.SEND_SMS] = ('POST', '/session/$sessionId/appium/device/send_sms')
+        self.command_executor.add_command(Command.SEND_SMS, 'POST', '/session/$sessionId/appium/device/send_sms')

{appium_python_client-4.2.1 → appium_python_client-4.4.0}/appium/webdriver/extensions/android/system_bars.py

@@ -51,9 +51,8 @@ class SystemBars(CanExecuteCommands, CanExecuteScripts, CanRememberExtensionPres
             return self.mark_extension_absence(ext_name).execute(Command.GET_SYSTEM_BARS)['value']
 
     def _add_commands(self) -> None:
-        # noinspection PyProtectedMember,PyUnresolvedReferences
-        commands = self.command_executor._commands
-        commands[Command.GET_SYSTEM_BARS] = (
+        self.command_executor.add_command(
+            Command.GET_SYSTEM_BARS,
             'GET',
             '/session/$sessionId/appium/device/system_bars',
         )

{appium_python_client-4.2.1 → appium_python_client-4.4.0}/appium/webdriver/extensions/applications.py

@@ -248,25 +248,27 @@ class Applications(CanExecuteCommands, CanExecuteScripts, CanRememberExtensionPr
             return self.mark_extension_absence(ext_name).execute(Command.GET_APP_STRINGS, data)['value']
 
     def _add_commands(self) -> None:
-        # noinspection PyProtectedMember,PyUnresolvedReferences
-        commands = self.command_executor._commands
-        commands[Command.BACKGROUND] = ('POST', '/session/$sessionId/appium/app/background')
-        commands[Command.IS_APP_INSTALLED] = (
+        self.command_executor.add_command(Command.BACKGROUND, 'POST', '/session/$sessionId/appium/app/background')
+        self.command_executor.add_command(
+            Command.IS_APP_INSTALLED,
             'POST',
             '/session/$sessionId/appium/device/app_installed',
         )
-        commands[Command.INSTALL_APP] = ('POST', '/session/$sessionId/appium/device/install_app')
-        commands[Command.REMOVE_APP] = ('POST', '/session/$sessionId/appium/device/remove_app')
-        commands[Command.TERMINATE_APP] = (
+        self.command_executor.add_command(Command.INSTALL_APP, 'POST', '/session/$sessionId/appium/device/install_app')
+        self.command_executor.add_command(Command.REMOVE_APP, 'POST', '/session/$sessionId/appium/device/remove_app')
+        self.command_executor.add_command(
+            Command.TERMINATE_APP,
             'POST',
             '/session/$sessionId/appium/device/terminate_app',
         )
-        commands[Command.ACTIVATE_APP] = (
+        self.command_executor.add_command(
+            Command.ACTIVATE_APP,
             'POST',
             '/session/$sessionId/appium/device/activate_app',
         )
-        commands[Command.QUERY_APP_STATE] = (
+        self.command_executor.add_command(
+            Command.QUERY_APP_STATE,
             'POST',
             '/session/$sessionId/appium/device/app_state',
         )
-        commands[Command.GET_APP_STRINGS] = ('POST', '/session/$sessionId/appium/app/strings')
+        self.command_executor.add_command(Command.GET_APP_STRINGS, 'POST', '/session/$sessionId/appium/app/strings')

{appium_python_client-4.2.1 → appium_python_client-4.4.0}/appium/webdriver/extensions/clipboard.py

@@ -95,13 +95,13 @@ class Clipboard(CanExecuteCommands, CanExecuteScripts, CanRememberExtensionPrese
         return self.get_clipboard(ClipboardContentType.PLAINTEXT).decode('UTF-8')
 
     def _add_commands(self) -> None:
-        # noinspection PyProtectedMember,PyUnresolvedReferences
-        commands = self.command_executor._commands
-        commands[Command.SET_CLIPBOARD] = (
+        self.command_executor.add_command(
+            Command.SET_CLIPBOARD,
             'POST',
             '/session/$sessionId/appium/device/set_clipboard',
         )
-        commands[Command.GET_CLIPBOARD] = (
+        self.command_executor.add_command(
+            Command.GET_CLIPBOARD,
             'POST',
             '/session/$sessionId/appium/device/get_clipboard',
         )

{appium_python_client-4.2.1 → appium_python_client-4.4.0}/appium/webdriver/extensions/context.py

@@ -58,8 +58,6 @@ class Context(CanExecuteCommands):
         return self.current_context
 
     def _add_commands(self) -> None:
-        # noinspection PyProtectedMember,PyUnresolvedReferences
-        commands = self.command_executor._commands
-        commands[Command.CONTEXTS] = ('GET', '/session/$sessionId/contexts')
-        commands[Command.GET_CURRENT_CONTEXT] = ('GET', '/session/$sessionId/context')
-        commands[Command.SWITCH_TO_CONTEXT] = ('POST', '/session/$sessionId/context')
+        self.command_executor.add_command(Command.CONTEXTS, 'GET', '/session/$sessionId/contexts')
+        self.command_executor.add_command(Command.GET_CURRENT_CONTEXT, 'GET', '/session/$sessionId/context')
+        self.command_executor.add_command(Command.SWITCH_TO_CONTEXT, 'POST', '/session/$sessionId/context')

{appium_python_client-4.2.1 → appium_python_client-4.4.0}/appium/webdriver/extensions/device_time.py

@@ -63,13 +63,13 @@ class DeviceTime(CanExecuteCommands, CanExecuteScripts, CanRememberExtensionPres
             return self.mark_extension_absence(ext_name).execute(Command.GET_DEVICE_TIME_POST, {'format': format})['value']
 
     def _add_commands(self) -> None:
-        # noinspection PyProtectedMember,PyUnresolvedReferences
-        commands = self.command_executor._commands
-        commands[Command.GET_DEVICE_TIME_GET] = (
+        self.command_executor.add_command(
+            Command.GET_DEVICE_TIME_GET,
             'GET',
             '/session/$sessionId/appium/device/system_time',
         )
-        commands[Command.GET_DEVICE_TIME_POST] = (
+        self.command_executor.add_command(
+            Command.GET_DEVICE_TIME_POST,
             'POST',
             '/session/$sessionId/appium/device/system_time',
         )

{appium_python_client-4.2.1 → appium_python_client-4.4.0}/appium/webdriver/extensions/execute_driver.py

@@ -57,6 +57,4 @@ class ExecuteDriver(CanExecuteCommands):
         return Result(response)
 
     def _add_commands(self) -> None:
-        # noinspection PyProtectedMember,PyUnresolvedReferences
-        commands = self.command_executor._commands
-        commands[Command.EXECUTE_DRIVER] = ('POST', '/session/$sessionId/appium/execute_driver')
+        self.command_executor.add_command(Command.EXECUTE_DRIVER, 'POST', '/session/$sessionId/appium/execute_driver')

{appium_python_client-4.2.1 → appium_python_client-4.4.0}/appium/webdriver/extensions/flutter_integration/flutter_finder.py

@@ -15,13 +15,16 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from typing import Tuple
+from typing import Tuple, Union
+
+from selenium.webdriver.common.by import ByType as SeleniumByType
 
 from appium.webdriver.common.appiumby import AppiumBy
+from appium.webdriver.common.appiumby import ByType as AppiumByType
 
 
 class FlutterFinder:
-    def __init__(self, using: str, value: str) -> None:
+    def __init__(self, using: Union[SeleniumByType, AppiumByType], value: str) -> None:
         self.using = using
         self.value = value
 

{appium_python_client-4.2.1 → appium_python_client-4.4.0}/appium/webdriver/extensions/hw_actions.py

@@ -132,18 +132,18 @@ class HardwareActions(CanExecuteCommands, CanExecuteScripts, CanRememberExtensio
         return self
 
     def _add_commands(self) -> None:
-        # noinspection PyProtectedMember,PyUnresolvedReferences
-        commands = self.command_executor._commands
-        commands[Command.LOCK] = ('POST', '/session/$sessionId/appium/device/lock')
-        commands[Command.UNLOCK] = ('POST', '/session/$sessionId/appium/device/unlock')
-        commands[Command.IS_LOCKED] = ('POST', '/session/$sessionId/appium/device/is_locked')
-        commands[Command.SHAKE] = ('POST', '/session/$sessionId/appium/device/shake')
-        commands[Command.TOUCH_ID] = ('POST', '/session/$sessionId/appium/simulator/touch_id')
-        commands[Command.TOGGLE_TOUCH_ID_ENROLLMENT] = (
+        self.command_executor.add_command(Command.LOCK, 'POST', '/session/$sessionId/appium/device/lock')
+        self.command_executor.add_command(Command.UNLOCK, 'POST', '/session/$sessionId/appium/device/unlock')
+        self.command_executor.add_command(Command.IS_LOCKED, 'POST', '/session/$sessionId/appium/device/is_locked')
+        self.command_executor.add_command(Command.SHAKE, 'POST', '/session/$sessionId/appium/device/shake')
+        self.command_executor.add_command(Command.TOUCH_ID, 'POST', '/session/$sessionId/appium/simulator/touch_id')
+        self.command_executor.add_command(
+            Command.TOGGLE_TOUCH_ID_ENROLLMENT,
             'POST',
             '/session/$sessionId/appium/simulator/toggle_touch_id_enrollment',
         )
-        commands[Command.FINGER_PRINT] = (
+        self.command_executor.add_command(
+            Command.FINGER_PRINT,
             'POST',
             '/session/$sessionId/appium/device/finger_print',
         )

{appium_python_client-4.2.1 → appium_python_client-4.4.0}/appium/webdriver/extensions/images_comparison.py

@@ -129,6 +129,4 @@ class ImagesComparison(CanExecuteCommands):
         return self.execute(Command.COMPARE_IMAGES, options)['value']
 
     def _add_commands(self) -> None:
-        # noinspection PyProtectedMember,PyUnresolvedReferences
-        commands = self.command_executor._commands
-        commands[Command.COMPARE_IMAGES] = ('POST', '/session/$sessionId/appium/compare_images')
+        self.command_executor.add_command(Command.COMPARE_IMAGES, 'POST', '/session/$sessionId/appium/compare_images')

{appium_python_client-4.2.1 → appium_python_client-4.4.0}/appium/webdriver/extensions/keyboard.py

@@ -145,22 +145,24 @@ class Keyboard(CanExecuteCommands, CanExecuteScripts, CanRememberExtensionPresen
         return self
 
     def _add_commands(self) -> None:
-        # noinspection PyProtectedMember,PyUnresolvedReferences
-        commands = self.command_executor._commands
-        commands[Command.HIDE_KEYBOARD] = (
+        self.command_executor.add_command(
+            Command.HIDE_KEYBOARD,
             'POST',
             '/session/$sessionId/appium/device/hide_keyboard',
         )
-        commands[Command.IS_KEYBOARD_SHOWN] = (
+        self.command_executor.add_command(
+            Command.IS_KEYBOARD_SHOWN,
             'GET',
             '/session/$sessionId/appium/device/is_keyboard_shown',
         )
-        commands[Command.KEY_EVENT] = ('POST', '/session/$sessionId/appium/device/keyevent')
-        commands[Command.PRESS_KEYCODE] = (
+        self.command_executor.add_command(Command.KEY_EVENT, 'POST', '/session/$sessionId/appium/device/keyevent')
+        self.command_executor.add_command(
+            Command.PRESS_KEYCODE,
             'POST',
             '/session/$sessionId/appium/device/press_keycode',
         )
-        commands[Command.LONG_PRESS_KEYCODE] = (
+        self.command_executor.add_command(
+            Command.LONG_PRESS_KEYCODE,
             'POST',
             '/session/$sessionId/appium/device/long_press_keycode',
         )