wholy typing package import replaced with from import

Author: iampopovich

py/selenium/webdriver/chrome/remote_connection.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-import typing
+from typing import Optional
 
 from selenium.webdriver import DesiredCapabilities
 from selenium.webdriver.chromium.remote_connection import ChromiumRemoteConnection
@@ -27,7 +27,7 @@ def __init__(
         self,
         remote_server_addr: str,
         keep_alive: bool = True,
-        ignore_proxy: typing.Optional[bool] = False,
+        ignore_proxy: Optional[bool] = False,
     ) -> None:
         super().__init__(
             remote_server_addr=remote_server_addr,

py/selenium/webdriver/chrome/service.py

@@ -14,7 +14,9 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-import typing
+from typing import List
+from typing import Mapping
+from typing import Optional
 
 from selenium.types import SubprocessStdAlias
 from selenium.webdriver.chromium import service
@@ -35,9 +37,9 @@ def __init__(
         self,
         executable_path=None,
         port: int = 0,
-        service_args: typing.Optional[typing.List[str]] = None,
+        service_args: Optional[List[str]] = None,
         log_output: SubprocessStdAlias = None,
-        env: typing.Optional[typing.Mapping[str, str]] = None,
+        env: Optional[Mapping[str, str]] = None,
         **kwargs,
     ) -> None:
         super().__init__(

py/selenium/webdriver/chromium/service.py

@@ -14,7 +14,9 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-import typing
+from typing import List
+from typing import Mapping
+from typing import Optional
 
 from selenium.types import SubprocessStdAlias
 from selenium.webdriver.common import service
@@ -35,9 +37,9 @@ def __init__(
         self,
         executable_path: str = None,
         port: int = 0,
-        service_args: typing.Optional[typing.List[str]] = None,
+        service_args: Optional[List[str]] = None,
         log_output: SubprocessStdAlias = None,
-        env: typing.Optional[typing.Mapping[str, str]] = None,
+        env: Optional[Mapping[str, str]] = None,
         **kwargs,
     ) -> None:
         self.service_args = service_args or []
@@ -56,5 +58,5 @@ def __init__(
             **kwargs,
         )
 
-    def command_line_args(self) -> typing.List[str]:
+    def command_line_args(self) -> List[str]:
         return [f"--port={self.port}"] + self.service_args

py/selenium/webdriver/common/actions/pointer_input.py

@@ -14,7 +14,9 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-import typing
+from typing import Any
+from typing import Dict
+from typing import Optional
 
 from selenium.common.exceptions import InvalidArgumentException
 from selenium.webdriver.remote.webelement import WebElement
@@ -40,7 +42,7 @@ def create_pointer_move(
         duration=DEFAULT_MOVE_DURATION,
         x: float = 0,
         y: float = 0,
-        origin: typing.Optional[WebElement] = None,
+        origin: Optional[WebElement] = None,
         **kwargs,
     ):
         action = {"type": "pointerMove", "duration": duration, "x": x, "y": y, **kwargs}
@@ -66,7 +68,7 @@ def create_pause(self, pause_duration: float) -> None:
     def encode(self):
         return {"type": self.type, "parameters": {"pointerType": self.kind}, "id": self.name, "actions": self.actions}
 
-    def _convert_keys(self, actions: typing.Dict[str, typing.Any]):
+    def _convert_keys(self, actions: Dict[str, Any]):
         out = {}
         for k, v in actions.items():
             if v is None:

py/selenium/webdriver/common/bidi/cdp.py

@@ -30,18 +30,23 @@
 import json
 import logging
 import pathlib
-import typing
 from collections import defaultdict
 from contextlib import asynccontextmanager
 from contextlib import contextmanager
 from dataclasses import dataclass
+from typing import Any
+from typing import AsyncGenerator
+from typing import AsyncIterator
+from typing import Generator
+from typing import Type
+from typing import TypeVar
 
 import trio
 from trio_websocket import ConnectionClosed as WsConnectionClosed
 from trio_websocket import connect_websocket_url
 
 logger = logging.getLogger("trio_cdp")
-T = typing.TypeVar("T")
+T = TypeVar("T")
 MAX_WS_MESSAGE_SIZE = 2**24
 
 devtools = None
@@ -184,7 +189,7 @@ class CmEventProxy:
     value set that contains the returned event.
     """
 
-    value: typing.Any = None
+    value: Any = None
 
 
 class CdpBase:
@@ -197,7 +202,7 @@ def __init__(self, ws, session_id, target_id):
         self.inflight_cmd = {}
         self.inflight_result = {}
 
-    async def execute(self, cmd: typing.Generator[dict, T, typing.Any]) -> T:
+    async def execute(self, cmd: Generator[dict, T, Any]) -> T:
         """Execute a command on the server and wait for the result.
 
         :param cmd: any CDP command
@@ -230,7 +235,7 @@ def listen(self, *event_types, buffer_size=10):
         return receiver
 
     @asynccontextmanager
-    async def wait_for(self, event_type: typing.Type[T], buffer_size=10) -> typing.AsyncGenerator[CmEventProxy, None]:
+    async def wait_for(self, event_type: Type[T], buffer_size=10) -> AsyncGenerator[CmEventProxy, None]:
         """Wait for an event of the given type and return it.
 
         This is an async context manager, so you should open it inside
@@ -398,7 +403,7 @@ async def aclose(self):
         await self.ws.aclose()
 
     @asynccontextmanager
-    async def open_session(self, target_id) -> typing.AsyncIterator[CdpSession]:
+    async def open_session(self, target_id) -> AsyncIterator[CdpSession]:
         """This context manager opens a session and enables the "simple" style
         of calling CDP APIs.
 
@@ -460,7 +465,7 @@ async def _reader_task(self):
 
 
 @asynccontextmanager
-async def open_cdp(url) -> typing.AsyncIterator[CdpConnection]:
+async def open_cdp(url) -> AsyncIterator[CdpConnection]:
     """This async context manager opens a connection to the browser specified
     by ``url`` before entering the block, then closes the connection when the
     block exits.

py/selenium/webdriver/common/bidi/script.py

@@ -15,8 +15,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
-import typing
+
 from dataclasses import dataclass
+from typing import List
 
 from .session import session_subscribe
 from .session import session_unsubscribe
@@ -77,7 +78,7 @@ class ConsoleLogEntry:
     text: str
     timestamp: str
     method: str
-    args: typing.List[dict]
+    args: List[dict]
     type_: str
 
     @classmethod

py/selenium/webdriver/common/options.py

@@ -14,10 +14,11 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-import typing
+
 from abc import ABCMeta
 from abc import abstractmethod
 from enum import Enum
+from typing import Optional
 
 from selenium.common.exceptions import InvalidArgumentException
 from selenium.webdriver.common.proxy import Proxy
@@ -456,9 +457,9 @@ def set_capability(self, name, value) -> None:
 
     def enable_mobile(
         self,
-        android_package: typing.Optional[str] = None,
-        android_activity: typing.Optional[str] = None,
-        device_serial: typing.Optional[str] = None,
+        android_package: Optional[str] = None,
+        android_activity: Optional[str] = None,
+        device_serial: Optional[str] = None,
     ) -> None:
         """Enables mobile browser use for browsers that support it.
 

py/selenium/webdriver/common/service.py

@@ -18,13 +18,16 @@
 import logging
 import os
 import subprocess
-import typing
 from abc import ABC
 from abc import abstractmethod
 from io import IOBase
 from platform import system
 from subprocess import PIPE
 from time import sleep
+from typing import Any
+from typing import List
+from typing import Mapping
+from typing import Optional
 from urllib import request
 from urllib.error import URLError
 
@@ -51,7 +54,7 @@ def __init__(
         executable_path: str = None,
         port: int = 0,
         log_output: SubprocessStdAlias = None,
-        env: typing.Optional[typing.Mapping[typing.Any, typing.Any]] = None,
+        env: Optional[Mapping[Any, Any]] = None,
         **kwargs,
     ) -> None:
         if isinstance(log_output, str):
@@ -76,7 +79,7 @@ def service_url(self) -> str:
         return f"http://{utils.join_host_port('localhost', self.port)}"
 
     @abstractmethod
-    def command_line_args(self) -> typing.List[str]:
+    def command_line_args(self) -> List[str]:
         """A List of program arguments (excluding the executable)."""
         raise NotImplementedError("This method needs to be implemented in a sub class")
 

py/selenium/webdriver/common/virtual_authenticator.py

@@ -16,10 +16,13 @@
 # under the License.
 
 import functools
-import typing
 from base64 import urlsafe_b64decode
 from base64 import urlsafe_b64encode
 from enum import Enum
+from typing import Any
+from typing import Dict
+from typing import Optional
+from typing import Union
 
 
 class Protocol(str, Enum):
@@ -65,7 +68,7 @@ def __init__(
         self.is_user_consenting: bool = is_user_consenting
         self.is_user_verified: bool = is_user_verified
 
-    def to_dict(self) -> typing.Dict[str, typing.Union[str, bool]]:
+    def to_dict(self) -> Dict[str, Union[str, bool]]:
         return {
             "protocol": self.protocol,
             "transport": self.transport,
@@ -82,7 +85,7 @@ def __init__(
         credential_id: bytes,
         is_resident_credential: bool,
         rp_id: str,
-        user_handle: typing.Optional[bytes],
+        user_handle: Optional[bytes],
         private_key: bytes,
         sign_count: int,
     ):
@@ -117,7 +120,7 @@ def rp_id(self) -> str:
         return self._rp_id
 
     @property
-    def user_handle(self) -> typing.Optional[str]:
+    def user_handle(self) -> Optional[str]:
         if self._user_handle:
             return urlsafe_b64encode(self._user_handle).decode()
         return None
@@ -147,7 +150,7 @@ def create_non_resident_credential(cls, id: bytes, rp_id: str, private_key: byte
 
     @classmethod
     def create_resident_credential(
-        cls, id: bytes, rp_id: str, user_handle: typing.Optional[bytes], private_key: bytes, sign_count: int
+        cls, id: bytes, rp_id: str, user_handle: Optional[bytes], private_key: bytes, sign_count: int
     ) -> "Credential":
         """Creates a resident (i.e. stateful) credential.
 
@@ -163,7 +166,7 @@ def create_resident_credential(
         """
         return cls(id, True, rp_id, user_handle, private_key, sign_count)
 
-    def to_dict(self) -> typing.Dict[str, typing.Any]:
+    def to_dict(self) -> Dict[str, Any]:
         credential_data = {
             "credentialId": self.id,
             "isResidentCredential": self._is_resident_credential,
@@ -178,7 +181,7 @@ def to_dict(self) -> typing.Dict[str, typing.Any]:
         return credential_data
 
     @classmethod
-    def from_dict(cls, data: typing.Dict[str, typing.Any]) -> "Credential":
+    def from_dict(cls, data: Dict[str, Any]) -> "Credential":
         _id = urlsafe_b64decode(f"{data['credentialId']}==")
         is_resident_credential = bool(data["isResidentCredential"])
         rp_id = data.get("rpId", None)

py/selenium/webdriver/edge/remote_connection.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-import typing
+from typing import Optional
 
 from selenium.webdriver import DesiredCapabilities
 from selenium.webdriver.chromium.remote_connection import ChromiumRemoteConnection
@@ -27,7 +27,7 @@ def __init__(
         self,
         remote_server_addr: str,
         keep_alive: bool = True,
-        ignore_proxy: typing.Optional[bool] = False,
+        ignore_proxy: Optional[bool] = False,
     ) -> None:
         super().__init__(
             remote_server_addr=remote_server_addr,

py/selenium/webdriver/edge/service.py

@@ -14,7 +14,11 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-import typing
+
+
+from typing import List
+from typing import Mapping
+from typing import Optional
 
 from selenium.types import SubprocessStdAlias
 from selenium.webdriver.chromium import service
@@ -38,8 +42,8 @@ def __init__(
         executable_path: str = None,
         port: int = 0,
         log_output: SubprocessStdAlias = None,
-        service_args: typing.Optional[typing.List[str]] = None,
-        env: typing.Optional[typing.Mapping[str, str]] = None,
+        service_args: Optional[List[str]] = None,
+        env: Optional[Mapping[str, str]] = None,
         **kwargs,
     ) -> None:
         self.service_args = service_args or []

py/selenium/webdriver/firefox/service.py

@@ -14,8 +14,10 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-import typing
+
 from typing import List
+from typing import Mapping
+from typing import Optional
 
 from selenium.types import SubprocessStdAlias
 from selenium.webdriver.common import service
@@ -37,9 +39,9 @@ def __init__(
         self,
         executable_path: str = None,
         port: int = 0,
-        service_args: typing.Optional[typing.List[str]] = None,
+        service_args: Optional[List[str]] = None,
         log_output: SubprocessStdAlias = None,
-        env: typing.Optional[typing.Mapping[str, str]] = None,
+        env: Optional[Mapping[str, str]] = None,
         **kwargs,
     ) -> None:
         self.service_args = service_args or []