chore: update linters (pyright/mypy/pre-commit) (#2588)

Author: mxschmitt

.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -15,16 +15,16 @@ repos:
       - id: check-executables-have-shebangs
       - id: check-merge-conflict
   - repo: https://github.com/psf/black
-    rev: 23.9.1
+    rev: 24.8.0
     hooks:
       - id: black
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.8.0
+    rev: v1.11.2
     hooks:
       - id: mypy
-        additional_dependencies: [types-pyOpenSSL==23.2.0.2, types-requests==2.31.0.10]
+        additional_dependencies: [types-pyOpenSSL==24.1.0.20240722, types-requests==2.32.0.20240914]
   - repo: https://github.com/pycqa/flake8
-    rev: 6.1.0
+    rev: 7.1.1
     hooks:
       - id: flake8
   - repo: https://github.com/pycqa/isort
@@ -39,7 +39,7 @@ repos:
         language: node
         pass_filenames: false
         types: [python]
-        additional_dependencies: ["pyright@1.1.278"]
+        additional_dependencies: ["pyright@1.1.384"]
   - repo: local
     hooks:
       - id: check-license-header

local-requirements.txt

@@ -7,7 +7,7 @@ mypy==1.11.2
 objgraph==3.6.1
 Pillow==10.4.0
 pixelmatch==0.3.0
-pre-commit==3.4.0
+pre-commit==3.5.0
 pyOpenSSL==24.2.1
 pytest==8.3.3
 pytest-asyncio==0.21.2

playwright/_impl/_assertions.py

@@ -512,9 +512,11 @@ async def to_be_attached(
     ) -> None:
         __tracebackhide__ = True
         await self._expect_impl(
-            "to.be.attached"
-            if (attached is None or attached is True)
-            else "to.be.detached",
+            (
+                "to.be.attached"
+                if (attached is None or attached is True)
+                else "to.be.detached"
+            ),
             FrameExpectOptions(timeout=timeout),
             None,
             "Locator expected to be attached",
@@ -527,9 +529,11 @@ async def to_be_checked(
     ) -> None:
         __tracebackhide__ = True
         await self._expect_impl(
-            "to.be.checked"
-            if checked is None or checked is True
-            else "to.be.unchecked",
+            (
+                "to.be.checked"
+                if checked is None or checked is True
+                else "to.be.unchecked"
+            ),
             FrameExpectOptions(timeout=timeout),
             None,
             "Locator expected to be checked",

playwright/_impl/_async_base.py

@@ -15,7 +15,7 @@
 import asyncio
 from contextlib import AbstractAsyncContextManager
 from types import TracebackType
-from typing import Any, Callable, Generic, Optional, Type, TypeVar
+from typing import Any, Callable, Generic, Optional, Type, TypeVar, Union
 
 from playwright._impl._impl_to_api_mapping import ImplToApiMapping, ImplWrapper
 
@@ -68,7 +68,9 @@ def __init__(self, impl_obj: Any) -> None:
     def __str__(self) -> str:
         return self._impl_obj.__str__()
 
-    def _wrap_handler(self, handler: Any) -> Callable[..., None]:
+    def _wrap_handler(
+        self, handler: Union[Callable[..., Any], Any]
+    ) -> Callable[..., None]:
         if callable(handler):
             return mapping.wrap_handler(handler)
         return handler
@@ -100,5 +102,4 @@ async def __aexit__(
     ) -> None:
         await self.close()
 
-    async def close(self) -> None:
-        ...
+    async def close(self) -> None: ...

playwright/_impl/_browser_context.py

@@ -316,21 +316,21 @@ async def clear_cookies(
             {
                 "name": name if isinstance(name, str) else None,
                 "nameRegexSource": name.pattern if isinstance(name, Pattern) else None,
-                "nameRegexFlags": escape_regex_flags(name)
-                if isinstance(name, Pattern)
-                else None,
+                "nameRegexFlags": (
+                    escape_regex_flags(name) if isinstance(name, Pattern) else None
+                ),
                 "domain": domain if isinstance(domain, str) else None,
-                "domainRegexSource": domain.pattern
-                if isinstance(domain, Pattern)
-                else None,
-                "domainRegexFlags": escape_regex_flags(domain)
-                if isinstance(domain, Pattern)
-                else None,
+                "domainRegexSource": (
+                    domain.pattern if isinstance(domain, Pattern) else None
+                ),
+                "domainRegexFlags": (
+                    escape_regex_flags(domain) if isinstance(domain, Pattern) else None
+                ),
                 "path": path if isinstance(path, str) else None,
                 "pathRegexSource": path.pattern if isinstance(path, Pattern) else None,
-                "pathRegexFlags": escape_regex_flags(path)
-                if isinstance(path, Pattern)
-                else None,
+                "pathRegexFlags": (
+                    escape_regex_flags(path) if isinstance(path, Pattern) else None
+                ),
             },
         )
 

playwright/_impl/_connection.py

@@ -197,9 +197,9 @@ def cb(task: asyncio.Task) -> None:
         if current_task:
             current_task.add_done_callback(cb)
             self.future.add_done_callback(
-                lambda _: current_task.remove_done_callback(cb)
-                if current_task
-                else None
+                lambda _: (
+                    current_task.remove_done_callback(cb) if current_task else None
+                )
             )
 
 
@@ -243,9 +243,9 @@ def __init__(
         self._error: Optional[BaseException] = None
         self.is_remote = False
         self._init_task: Optional[asyncio.Task] = None
-        self._api_zone: contextvars.ContextVar[
-            Optional[ParsedStackTrace]
-        ] = contextvars.ContextVar("ApiZone", default=None)
+        self._api_zone: contextvars.ContextVar[Optional[ParsedStackTrace]] = (
+            contextvars.ContextVar("ApiZone", default=None)
+        )
         self._local_utils: Optional["LocalUtils"] = local_utils
         self._tracing_count = 0
         self._closed_error: Optional[Exception] = None

playwright/_impl/_impl_to_api_mapping.py

@@ -117,7 +117,7 @@ def to_impl(
         except RecursionError:
             raise Error("Maximum argument depth exceeded")
 
-    def wrap_handler(self, handler: Callable[..., None]) -> Callable[..., None]:
+    def wrap_handler(self, handler: Callable[..., Any]) -> Callable[..., None]:
         def wrapper_func(*args: Any) -> Any:
             arg_count = len(inspect.signature(handler).parameters)
             return handler(

playwright/_impl/_js_handle.py

@@ -145,13 +145,17 @@ def serialize_value(
         return {
             "e": {
                 "m": str(value),
-                "n": (value.name or "")
-                if isinstance(value, Error)
-                else value.__class__.__name__,
-                "s": (value.stack or "")
-                if isinstance(value, Error)
-                else "".join(
-                    traceback.format_exception(type(value), value=value, tb=None)
+                "n": (
+                    (value.name or "")
+                    if isinstance(value, Error)
+                    else value.__class__.__name__
+                ),
+                "s": (
+                    (value.stack or "")
+                    if isinstance(value, Error)
+                    else "".join(
+                        traceback.format_exception(type(value), value=value, tb=None)
+                    )
                 ),
             }
         }

playwright/_impl/_json_pipe.py

@@ -33,7 +33,6 @@ def __init__(
         Transport.__init__(self, loop)
         self._stop_requested = False
         self._pipe_channel = pipe_channel
-        self._loop: asyncio.AbstractEventLoop
 
     def request_stop(self) -> None:
         self._stop_requested = True

playwright/_impl/_sync_base.py

@@ -114,7 +114,9 @@ def _sync(
         asyncio._set_running_loop(self._loop)
         return task.result()
 
-    def _wrap_handler(self, handler: Any) -> Callable[..., None]:
+    def _wrap_handler(
+        self, handler: Union[Callable[..., Any], Any]
+    ) -> Callable[..., None]:
         if callable(handler):
             return mapping.wrap_handler(handler)
         return handler
@@ -146,5 +148,4 @@ def __exit__(
     ) -> None:
         self.close()
 
-    def close(self) -> None:
-        ...
+    def close(self) -> None: ...