[python] replace misuses of typing.NoReturn (#10462)

symonk · AutomatedTester · web-flow · commit 7217bb389dc3 · 2022-04-08T11:56:01.000+01:00
* replace incorrect uses of `typing.NoReturn` in `ChromiumOptions`

* fix other misuses of `typing.NoReturn`

Co-authored-by: David Burns &lt;david.burns@theautomatedtester.co.uk&gt;
diff --git a/py/selenium/webdriver/chromium/options.py b/py/selenium/webdriver/chromium/options.py
@@ -18,7 +18,7 @@
 import base64
 import os
 import warnings
-from typing import List, NoReturn, Union
+from typing import List, Union
 
 from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
 from selenium.webdriver.common.options import ArgOptions
@@ -43,7 +43,7 @@ def binary_location(self) -> str:
         return self._binary_location
 
     @binary_location.setter
-    def binary_location(self, value: str) -> NoReturn:
+    def binary_location(self, value: str) -> None:
         """
         Allows you to set where the chromium binary lives
         :Args:
@@ -59,7 +59,7 @@ def debugger_address(self: str) -> str:
         return self._debugger_address
 
     @debugger_address.setter
-    def debugger_address(self, value: str) -> NoReturn:
+    def debugger_address(self, value: str) -> None:
         """
         Allows you to set the address of the remote devtools instance
         that the ChromeDriver instance will try to connect to during an
@@ -85,7 +85,7 @@ def extensions(self) -> List[str]:
             file_.close()
         return encoded_extensions + self._extensions
 
-    def add_extension(self, extension: str) -> NoReturn:
+    def add_extension(self, extension: str) -> None:
         """
         Adds the path to the extension to a list that will be used to extract it
         to the ChromeDriver
@@ -102,7 +102,7 @@ def add_extension(self, extension: str) -> NoReturn:
         else:
             raise ValueError("argument can not be null")
 
-    def add_encoded_extension(self, extension: str) -> NoReturn:
+    def add_encoded_extension(self, extension: str) -> None:
         """
         Adds Base64 encoded string with extension data to a list that will be used to extract it
         to the ChromeDriver
@@ -122,7 +122,7 @@ def experimental_options(self) -> dict:
         """
         return self._experimental_options
 
-    def add_experimental_option(self, name: str, value: Union[str, int, dict, List[str]]) -> NoReturn:
+    def add_experimental_option(self, name: str, value: Union[str, int, dict, List[str]]) -> None:
         """
         Adds an experimental option which is passed to chromium.
 
@@ -142,7 +142,7 @@ def headless(self) -> bool:
         return '--headless' in self._arguments
 
     @headless.setter
-    def headless(self, value: bool) -> NoReturn:
+    def headless(self, value: bool) -> None:
         """
         Sets the headless argument
         :Args:
diff --git a/py/selenium/webdriver/chromium/webdriver.py b/py/selenium/webdriver/chromium/webdriver.py
@@ -15,7 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from typing import NoReturn
 from selenium.webdriver.common.options import BaseOptions
 from selenium.webdriver.common.service import Service
 from selenium.webdriver.edge.options import Options as EdgeOptions
@@ -117,7 +116,7 @@ def get_network_conditions(self):
         """
         return self.execute("getNetworkConditions")['value']
 
-    def set_network_conditions(self, **network_conditions) -> NoReturn:
+    def set_network_conditions(self, **network_conditions) -> None:
         """
         Sets Chromium network emulation settings.
 
@@ -139,13 +138,13 @@ def set_network_conditions(self, **network_conditions) -> NoReturn:
             'network_conditions': network_conditions
         })
 
-    def delete_network_conditions(self) -> NoReturn:
+    def delete_network_conditions(self) -> None:
         """
         Resets Chromium network emulation settings.
         """
         self.execute("deleteNetworkConditions")
 
-    def set_permissions(self, name: str, value: str) -> NoReturn:
+    def set_permissions(self, name: str, value: str) -> None:
         """
         Sets Applicable Permission.
 
@@ -226,7 +225,7 @@ def stop_casting(self, sink_name: str) -> str:
         """
         return self.execute('stopCasting', {'sinkName': sink_name})
 
-    def quit(self) -> NoReturn:
+    def quit(self) -> None:
         """
         Closes the browser and shuts down the ChromiumDriver executable
         that is started when starting the ChromiumDriver
diff --git a/py/selenium/webdriver/firefox/webdriver.py b/py/selenium/webdriver/firefox/webdriver.py
@@ -20,7 +20,6 @@
 from shutil import rmtree
 import warnings
 from contextlib import contextmanager
-from typing import NoReturn
 import zipfile
 
 from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
@@ -186,7 +185,7 @@ def __init__(self, firefox_profile=None, firefox_binary=None,
 
         self._is_remote = False
 
-    def quit(self) -> NoReturn:
+    def quit(self) -> None:
         """Quits the driver and close every associated window."""
         try:
             RemoteWebDriver.quit(self)
@@ -210,7 +209,7 @@ def firefox_profile(self):
 
     # Extension commands:
 
-    def set_context(self, context) -> NoReturn:
+    def set_context(self, context) -> None:
         self.execute("SET_CONTEXT", {"context": context})
 
     @contextmanager
@@ -266,7 +265,7 @@ def install_addon(self, path, temporary=False) -> str:
         payload = {"addon": addon, "temporary": temporary}
         return self.execute("INSTALL_ADDON", payload)["value"]
 
-    def uninstall_addon(self, identifier) -> NoReturn:
+    def uninstall_addon(self, identifier) -> None:
         """
         Uninstalls Firefox addon using its identifier.
 
diff --git a/py/selenium/webdriver/ie/webdriver.py b/py/selenium/webdriver/ie/webdriver.py
@@ -15,7 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from typing import NoReturn
 import warnings
 
 from selenium.webdriver.remote.webdriver import WebDriver as RemoteWebDriver
@@ -115,7 +114,7 @@ def __init__(self, executable_path=DEFAULT_EXECUTABLE_PATH, capabilities=None,
             keep_alive=keep_alive)
         self._is_remote = False
 
-    def quit(self) -> NoReturn:
+    def quit(self) -> None:
         RemoteWebDriver.quit(self)
         self.iedriver.stop()
 
