moar

mykola-mokhnach · mykola-mokhnach · commit 46e90d69743b · 2024-10-03T20:15:32.000+02:00
diff --git a/appium/webdriver/extensions/action_helpers.py b/appium/webdriver/extensions/action_helpers.py
@@ -14,16 +14,12 @@
 
 from typing import TYPE_CHECKING, List, Optional, Tuple, cast
 
-try:
-    from typing import Self
-except (ImportError, AttributeError):
-    from typing_extensions import Self
-
 from selenium.webdriver.common.action_chains import ActionChains
 from selenium.webdriver.common.actions import interaction
 from selenium.webdriver.common.actions.action_builder import ActionBuilder
 from selenium.webdriver.common.actions.mouse_button import MouseButton
 from selenium.webdriver.common.actions.pointer_input import PointerInput
+from typing_extensions import Self
 
 from appium.webdriver.webelement import WebElement
 
diff --git a/appium/webdriver/extensions/android/common.py b/appium/webdriver/extensions/android/common.py
@@ -11,12 +11,9 @@
 # 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.
-try:
-    from typing import Self
-except (ImportError, AttributeError):
-    from typing_extensions import Self
 
 from selenium.common.exceptions import UnknownMethodException
+from typing_extensions import Self
 
 from appium.protocols.webdriver.can_execute_commands import CanExecuteCommands
 from appium.protocols.webdriver.can_execute_scripts import CanExecuteScripts
diff --git a/appium/webdriver/extensions/android/gsm.py b/appium/webdriver/extensions/android/gsm.py
@@ -12,12 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-try:
-    from typing import Self
-except (ImportError, AttributeError):
-    from typing_extensions import Self
-
 from selenium.common.exceptions import UnknownMethodException
+from typing_extensions import Self
 
 from appium.common.helper import extract_const_attributes
 from appium.common.logger import logger
diff --git a/appium/webdriver/extensions/android/network.py b/appium/webdriver/extensions/android/network.py
@@ -12,12 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-try:
-    from typing import Self
-except (ImportError, AttributeError):
-    from typing_extensions import Self
-
 from selenium.common.exceptions import UnknownMethodException
+from typing_extensions import Self
 
 from appium.common.helper import extract_const_attributes
 from appium.common.logger import logger
diff --git a/appium/webdriver/extensions/android/power.py b/appium/webdriver/extensions/android/power.py
@@ -12,12 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-try:
-    from typing import Self
-except (ImportError, AttributeError):
-    from typing_extensions import Self
-
 from selenium.common.exceptions import UnknownMethodException
+from typing_extensions import Self
 
 from appium.protocols.webdriver.can_execute_commands import CanExecuteCommands
 from appium.protocols.webdriver.can_execute_scripts import CanExecuteScripts
diff --git a/appium/webdriver/extensions/android/sms.py b/appium/webdriver/extensions/android/sms.py
@@ -12,12 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-try:
-    from typing import Self
-except (ImportError, AttributeError):
-    from typing_extensions import Self
-
 from selenium.common.exceptions import UnknownMethodException
+from typing_extensions import Self
 
 from appium.protocols.webdriver.can_execute_commands import CanExecuteCommands
 from appium.protocols.webdriver.can_execute_scripts import CanExecuteScripts
diff --git a/appium/webdriver/extensions/clipboard.py b/appium/webdriver/extensions/clipboard.py
@@ -15,12 +15,8 @@
 import base64
 from typing import Optional
 
-try:
-    from typing import Self
-except (ImportError, AttributeError):
-    from typing_extensions import Self
-
 from selenium.common.exceptions import UnknownMethodException
+from typing_extensions import Self
 
 from appium.protocols.webdriver.can_execute_commands import CanExecuteCommands
 from appium.protocols.webdriver.can_execute_scripts import CanExecuteScripts
diff --git a/appium/webdriver/extensions/execute_mobile_command.py b/appium/webdriver/extensions/execute_mobile_command.py
@@ -14,10 +14,7 @@
 
 from typing import Any, Dict
 
-try:
-    from typing import Self
-except (ImportError, AttributeError):
-    from typing_extensions import Self
+from typing_extensions import Self
 
 from appium.protocols.webdriver.can_execute_scripts import CanExecuteScripts
 
diff --git a/appium/webdriver/extensions/keyboard.py b/appium/webdriver/extensions/keyboard.py
@@ -14,12 +14,8 @@
 
 from typing import Dict, Optional
 
-try:
-    from typing import Self
-except (ImportError, AttributeError):
-    from typing_extensions import Self
-
 from selenium.common.exceptions import UnknownMethodException
+from typing_extensions import Self
 
 from appium.protocols.webdriver.can_execute_commands import CanExecuteCommands
 from appium.protocols.webdriver.can_execute_scripts import CanExecuteScripts
diff --git a/appium/webdriver/extensions/location.py b/appium/webdriver/extensions/location.py
@@ -14,12 +14,8 @@
 
 from typing import Dict, Union
 
-try:
-    from typing import Self
-except (ImportError, AttributeError):
-    from typing_extensions import Self
-
 from selenium.common.exceptions import UnknownMethodException
+from typing_extensions import Self
 
 from appium.protocols.webdriver.can_execute_commands import CanExecuteCommands
 from appium.protocols.webdriver.can_execute_scripts import CanExecuteScripts
diff --git a/appium/webdriver/extensions/log_event.py b/appium/webdriver/extensions/log_event.py
@@ -14,10 +14,7 @@
 
 from typing import Dict, List, Union
 
-try:
-    from typing import Self
-except (ImportError, AttributeError):
-    from typing_extensions import Self
+from typing_extensions import Self
 
 from appium.protocols.webdriver.can_execute_commands import CanExecuteCommands
 
diff --git a/appium/webdriver/extensions/remote_fs.py b/appium/webdriver/extensions/remote_fs.py
@@ -15,12 +15,8 @@
 import base64
 from typing import Optional
 
-try:
-    from typing import Self
-except (ImportError, AttributeError):
-    from typing_extensions import Self
-
 from selenium.common.exceptions import InvalidArgumentException, UnknownMethodException
+from typing_extensions import Self
 
 from appium.protocols.webdriver.can_execute_commands import CanExecuteCommands
 from appium.protocols.webdriver.can_execute_scripts import CanExecuteScripts
diff --git a/appium/webdriver/extensions/settings.py b/appium/webdriver/extensions/settings.py
@@ -14,10 +14,7 @@
 
 from typing import Any, Dict
 
-try:
-    from typing import Self
-except (ImportError, AttributeError):
-    from typing_extensions import Self
+from typing_extensions import Self
 
 from appium.protocols.webdriver.can_execute_commands import CanExecuteCommands
 
diff --git a/appium/webdriver/switch_to.py b/appium/webdriver/switch_to.py
@@ -14,12 +14,8 @@
 
 from typing import Optional, Protocol
 
-try:
-    from typing import Self
-except (ImportError, AttributeError):
-    from typing_extensions import Self
-
 from selenium.webdriver.remote.switch_to import SwitchTo
+from typing_extensions import Self
 
 from appium.protocols.webdriver.can_execute_commands import CanExecuteCommands
 
diff --git a/appium/webdriver/webdriver.py b/appium/webdriver/webdriver.py
@@ -16,11 +16,6 @@
 
 from typing import Any, Callable, Dict, List, Optional, Set, Tuple, Union
 
-try:
-    from typing import Self
-except (ImportError, AttributeError):
-    from typing_extensions import Self
-
 from selenium import webdriver
 from selenium.common.exceptions import (
     InvalidArgumentException,
@@ -31,6 +26,7 @@
 from selenium.webdriver.common.by import By
 from selenium.webdriver.remote.command import Command as RemoteCommand
 from selenium.webdriver.remote.remote_connection import RemoteConnection
+from typing_extensions import Self
 
 from appium.common.logger import logger
 from appium.options.common.base import AppiumOptions
diff --git a/appium/webdriver/webelement.py b/appium/webdriver/webelement.py
@@ -14,14 +14,10 @@
 
 from typing import Callable, Dict, List, Optional, Union
 
-try:
-    from typing import Self
-except (ImportError, AttributeError):
-    from typing_extensions import Self
-
 from selenium.webdriver.common.utils import keys_to_typing
 from selenium.webdriver.remote.command import Command as RemoteCommand
 from selenium.webdriver.remote.webelement import WebElement as SeleniumWebElement
+from typing_extensions import Self
 
 from appium.webdriver.common.appiumby import AppiumBy
 
