Merge remote-tracking branch 'origin/trunk' into setup

Author: VietND96

java/src/org/openqa/selenium/internal/Require.java

@@ -129,11 +129,8 @@ public static int positive(String argName, Integer number, String message) {
       throw new IllegalArgumentException(String.format(MUST_BE_SET, argName));
     }
     if (number <= 0) {
-      if (message == null) {
-        throw new IllegalArgumentException(String.format(MUST_BE_POSITIVE, argName));
-      } else {
-        throw new IllegalArgumentException(message);
-      }
+      throw new IllegalArgumentException(
+          Objects.requireNonNullElseGet(message, () -> String.format(MUST_BE_POSITIVE, argName)));
     }
     return number;
   }
@@ -143,11 +140,8 @@ public static double positive(String argName, Double number, String message) {
       throw new IllegalArgumentException(String.format(MUST_BE_SET, argName));
     }
     if (number <= 0) {
-      if (message == null) {
-        throw new IllegalArgumentException(String.format(MUST_BE_POSITIVE, argName));
-      } else {
-        throw new IllegalArgumentException(message);
-      }
+      throw new IllegalArgumentException(
+          Objects.requireNonNullElseGet(message, () -> String.format(MUST_BE_POSITIVE, argName)));
     }
     return number;
   }

py/docs/source/index.rst

@@ -35,7 +35,7 @@ If you have `pip <https://pip.pypa.io/>`_ on your system, you can simply install
 
 Alternately, you can download the source distribution from `PyPI <https://pypi.org/project/selenium/#files>`, unarchive it, and run::
 
-    python setup.py install
+    python -m pip install .
 
 Note: You may want to consider using `virtualenv <http://www.virtualenv.org/>`_ to create isolated Python environments.
 

py/generate.py

@@ -36,7 +36,7 @@
 from pathlib import Path
 import re
 from textwrap import dedent, indent as tw_indent
-import typing
+from typing import Optional , cast, List, Union, Iterator
 
 import inflection  # type: ignore
 
@@ -206,11 +206,11 @@ def from_json(cls, type):
 class CdpProperty:
     ''' A property belonging to a non-primitive CDP type. '''
     name: str
-    description: typing.Optional[str]
-    type: typing.Optional[str]
-    ref: typing.Optional[str]
-    enum: typing.List[str]
-    items: typing.Optional[CdpItems]
+    description: Optional[str]
+    type: Optional[str]
+    ref: Optional[str]
+    enum: List[str]
+    items: Optional[CdpItems]
     optional: bool
     experimental: bool
     deprecated: bool
@@ -236,7 +236,7 @@ def py_annotation(self):
                 ann = py_ref
             else:
                 ann = CdpPrimitiveType.get_annotation(
-                    typing.cast(str, self.type))
+                    cast(str, self.type))
         if self.optional:
             ann = f'typing.Optional[{ann}]'
         return ann
@@ -316,11 +316,11 @@ def generate_from_json(self, dict_):
 class CdpType:
     ''' A top-level CDP type. '''
     id: str
-    description: typing.Optional[str]
+    description: Optional[str]
     type: str
-    items: typing.Optional[CdpItems]
-    enum: typing.List[str]
-    properties: typing.List[CdpProperty]
+    items: Optional[CdpItems]
+    enum: List[str]
+    properties: List[CdpProperty]
 
     @classmethod
     def from_json(cls, type_):
@@ -500,7 +500,7 @@ def generate_code(self):
                 py_type = f"{ref_to_python(self.ref)}"
             else:
                 py_type = CdpPrimitiveType.get_annotation(
-                    typing.cast(str, self.type))
+                    cast(str, self.type))
         if self.optional:
             py_type = f'typing.Optional[{py_type}]'
         code = f"{self.py_name}: {py_type}"
@@ -585,8 +585,8 @@ class CdpCommand:
     description: str
     experimental: bool
     deprecated: bool
-    parameters: typing.List[CdpParameter]
-    returns: typing.List[CdpReturn]
+    parameters: List[CdpParameter]
+    returns: List[CdpReturn]
     domain: str
 
     @property
@@ -605,8 +605,8 @@ def from_json(cls, command, domain) -> 'CdpCommand':
             command.get('description'),
             command.get('experimental', False),
             command.get('deprecated', False),
-            [typing.cast(CdpParameter, CdpParameter.from_json(p)) for p in parameters],
-            [typing.cast(CdpReturn, CdpReturn.from_json(r)) for r in returns],
+            [cast(CdpParameter, CdpParameter.from_json(p)) for p in parameters],
+            [cast(CdpReturn, CdpReturn.from_json(r)) for r in returns],
             domain,
         )
 
@@ -712,10 +712,10 @@ def get_refs(self):
 class CdpEvent:
     ''' A CDP event object. '''
     name: str
-    description: typing.Optional[str]
+    description: Optional[str]
     deprecated: bool
     experimental: bool
-    parameters: typing.List[CdpParameter]
+    parameters: List[CdpParameter]
     domain: str
 
     @property
@@ -731,7 +731,7 @@ def from_json(cls, json: dict, domain: str):
             json.get('description'),
             json.get('deprecated', False),
             json.get('experimental', False),
-            [typing.cast(CdpParameter, CdpParameter.from_json(p))
+            [cast(CdpParameter, CdpParameter.from_json(p))
                 for p in json.get('parameters', [])],
             domain
         )
@@ -786,12 +786,12 @@ def get_refs(self):
 class CdpDomain:
     ''' A CDP domain contains metadata, types, commands, and events. '''
     domain: str
-    description: typing.Optional[str]
+    description: Optional[str]
     experimental: bool
-    dependencies: typing.List[str]
-    types: typing.List[CdpType]
-    commands: typing.List[CdpCommand]
-    events: typing.List[CdpEvent]
+    dependencies: List[str]
+    types: List[CdpType]
+    commands: List[CdpCommand]
+    events: List[CdpEvent]
 
     @property
     def module(self):
@@ -826,8 +826,8 @@ def generate_code(self):
             code += import_code
             code += '\n\n'
         code += '\n'
-        item_iter_t = typing.Union[CdpEvent, CdpCommand, CdpType]
-        item_iter: typing.Iterator[item_iter_t] = itertools.chain(
+        item_iter_t = Union[CdpEvent, CdpCommand, CdpType]
+        item_iter: Iterator[item_iter_t] = itertools.chain(
             iter(self.types),
             iter(self.commands),
             iter(self.events),

py/selenium/types.py

@@ -16,10 +16,14 @@
 # under the License.
 """Selenium type definitions."""
 
-import typing
+from typing import IO
+from typing import Any
+from typing import Iterable
+from typing import Type
+from typing import Union
 
-AnyKey = typing.Union[str, int, float]
-WaitExcTypes = typing.Iterable[typing.Type[Exception]]
+AnyKey = Union[str, int, float]
+WaitExcTypes = Iterable[Type[Exception]]
 
 # Service Types
-SubprocessStdAlias = typing.Union[int, str, typing.IO[typing.Any]]
+SubprocessStdAlias = Union[int, str, IO[Any]]

py/selenium/webdriver/chrome/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
@@ -35,9 +39,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,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 io import IOBase
+from typing import List
+from typing import Mapping
+from typing import Optional
 
 from selenium.types import SubprocessStdAlias
 from selenium.webdriver.common import service
@@ -36,9 +38,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,
         driver_path_env_key: str = None,
         **kwargs,
     ) -> None:
@@ -47,7 +49,7 @@ def __init__(
 
         if isinstance(log_output, str):
             self.service_args.append(f"--log-path={log_output}")
-            self.log_output: typing.Optional[IOBase] = None
+            self.log_output: Optional[IOBase] = None
         elif isinstance(log_output, IOBase):
             self.log_output = log_output
         else:
@@ -62,5 +64,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,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 Any
+from typing import Dict
+from typing import Optional
 from typing import Union
 
 from selenium.common.exceptions import InvalidArgumentException
@@ -41,7 +44,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}
@@ -67,7 +70,7 @@ def create_pause(self, pause_duration: Union[int, float] = 0) -> 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
@@ -236,7 +241,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
@@ -406,7 +411,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.
 
@@ -468,7 +473,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,8 @@
 # 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
@@ -76,7 +76,7 @@ class ConsoleLogEntry:
     text: str
     timestamp: str
     method: str
-    args: typing.List[dict]
+    args: List[dict]
     type_: str
 
     @classmethod