[pre-commit.ci] pre-commit autoupdate (#1545)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: J. Nick Koston <[email protected]>

Author: pre-commit-ci[bot]

.pre-commit-config.yaml

@@ -27,7 +27,7 @@ repos:
     language_version: python3  # Should be a command that runs python
 
 - repo: https://github.com/python-jsonschema/check-jsonschema.git
-  rev: 0.32.1
+  rev: 0.33.2
   hooks:
   - id: check-github-workflows
     files: ^\.github/workflows/[^/]+$
@@ -71,12 +71,12 @@ repos:
   - id: detect-private-key
     exclude: ^examples/
 - repo: https://github.com/asottile/pyupgrade
-  rev: 'v3.19.1'
+  rev: 'v3.20.0'
   hooks:
   - id: pyupgrade
     args: ['--py39-plus']
 - repo: https://github.com/PyCQA/flake8
-  rev: '7.2.0'
+  rev: '7.3.0'
   hooks:
   - id: flake8
     exclude: "^docs/"
@@ -87,14 +87,14 @@ repos:
   - id: codespell
 
 - repo: https://github.com/adrienverge/yamllint.git
-  rev: v1.37.0
+  rev: v1.37.1
   hooks:
   - id: yamllint
     args:
     - --strict
 
 - repo: https://github.com/MarcoGorelli/cython-lint.git
-  rev: v0.16.6
+  rev: v0.16.7
   hooks:
   - id: cython-lint
 
@@ -107,7 +107,7 @@ repos:
       ^[^/]+[.]rst$
 
 - repo: https://github.com/pre-commit/mirrors-mypy.git
-  rev: v1.15.0
+  rev: v1.16.1
   hooks:
   - id: mypy
     alias: mypy-py311

yarl/_query.py

@@ -2,7 +2,7 @@
 
 import math
 from collections.abc import Iterable, Mapping, Sequence
-from typing import Any, SupportsInt, Union
+from typing import TYPE_CHECKING, Any, SupportsInt, Union, cast
 
 from multidict import istr
 
@@ -78,7 +78,12 @@ def get_str_query_from_iterable(
 
 def get_str_query(*args: Any, **kwargs: Any) -> Union[str, None]:
     """Return a query string from supported args."""
-    query: Union[str, Mapping[str, QueryVariable], None]
+    query: Union[
+        str,
+        Mapping[str, QueryVariable],
+        Sequence[tuple[Union[str, istr], SimpleQuery]],
+        None,
+    ]
     if kwargs:
         if args:
             msg = "Either kwargs or single query parameter must be present"
@@ -99,14 +104,16 @@ def get_str_query(*args: Any, **kwargs: Any) -> Union[str, None]:
         return QUERY_QUOTER(query)
     if isinstance(query, Mapping):
         return get_str_query_from_sequence_iterable(query.items())
-    if isinstance(query, (bytes, bytearray, memoryview)):  # type: ignore[unreachable]
+    if isinstance(query, (bytes, bytearray, memoryview)):
         msg = "Invalid query type: bytes, bytearray and memoryview are forbidden"
         raise TypeError(msg)
     if isinstance(query, Sequence):
         # We don't expect sequence values if we're given a list of pairs
         # already; only mappings like builtin `dict` which can't have the
         # same key pointing to multiple values are allowed to use
         # `_query_seq_pairs`.
+        if TYPE_CHECKING:
+            query = cast(Sequence[tuple[Union[str, istr], SimpleQuery]], query)
         return get_str_query_from_iterable(query)
     raise TypeError(
         "Invalid query type: only str, mapping or "

yarl/_quoting_py.py

@@ -1,7 +1,7 @@
 import codecs
 import re
 from string import ascii_letters, ascii_lowercase, digits
-from typing import Union, cast, overload
+from typing import Union, overload
 
 BASCII_LOWERCASE = ascii_lowercase.encode("ascii")
 BPCT_ALLOWED = {f"%{i:02X}".encode("ascii") for i in range(256)}
@@ -145,7 +145,7 @@ def __call__(self, val: Union[str, None]) -> Union[str, None]:
             raise TypeError("Argument should be str")
         if not val:
             return ""
-        decoder = cast(codecs.BufferedIncrementalDecoder, utf8_decoder())
+        decoder = utf8_decoder()
         ret = []
         idx = 0
         while idx < len(val):

yarl/_url.py

@@ -5,11 +5,20 @@
 from enum import Enum
 from functools import _CacheInfo, lru_cache
 from ipaddress import ip_address
-from typing import TYPE_CHECKING, Any, NoReturn, TypedDict, TypeVar, Union, overload
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    NoReturn,
+    TypedDict,
+    TypeVar,
+    Union,
+    cast,
+    overload,
+)
 from urllib.parse import SplitResult, uses_relative
 
 import idna
-from multidict import MultiDict, MultiDictProxy
+from multidict import MultiDict, MultiDictProxy, istr
 from propcache.api import under_cached_property as cached_property
 
 from ._parse import (
@@ -1231,7 +1240,12 @@ def update_query(self, *args: Any, **kwargs: Any) -> "URL":
         >>> url.update_query(a=3, c=4)
         URL('http://example.com/?a=3&b=2&c=4')
         """
-        in_query: Union[str, Mapping[str, QueryVariable], None]
+        in_query: Union[
+            str,
+            Mapping[str, QueryVariable],
+            Sequence[tuple[Union[str, istr], SimpleQuery]],
+            None,
+        ]
         if kwargs:
             if args:
                 msg = "Either kwargs or single query parameter must be present"
@@ -1254,14 +1268,18 @@ def update_query(self, *args: Any, **kwargs: Any) -> "URL":
             qstr: MultiDict[str] = MultiDict(self._parsed_query)
             qstr.update(query_to_pairs(in_query))
             query = get_str_query_from_iterable(qstr.items())
-        elif isinstance(in_query, (bytes, bytearray, memoryview)):  # type: ignore[unreachable]
+        elif isinstance(in_query, (bytes, bytearray, memoryview)):
             msg = "Invalid query type: bytes, bytearray and memoryview are forbidden"
             raise TypeError(msg)
         elif isinstance(in_query, Sequence):
             # We don't expect sequence values if we're given a list of pairs
             # already; only mappings like builtin `dict` which can't have the
             # same key pointing to multiple values are allowed to use
             # `_query_seq_pairs`.
+            if TYPE_CHECKING:
+                in_query = cast(
+                    Sequence[tuple[Union[str, istr], SimpleQuery]], in_query
+                )
             qs: MultiDict[SimpleQuery] = MultiDict(self._parsed_query)
             qs.update(in_query)
             query = get_str_query_from_iterable(qs.items())