Merge branch 'main' of https://github.com/python/typeshed into removing-setuptools._distutils

Author: Avasam

stdlib/@tests/test_cases/urllib/check_parse.py

@@ -0,0 +1,12 @@
+from __future__ import annotations
+
+from urllib.parse import quote, quote_plus, urlencode
+
+urlencode({"a": "b"}, quote_via=quote)
+urlencode({b"a": b"b"}, quote_via=quote)
+urlencode({"a": b"b"}, quote_via=quote)
+urlencode({b"a": "b"}, quote_via=quote)
+mixed_dict: dict[str | bytes, str | bytes] = {}
+urlencode(mixed_dict, quote_via=quote)
+
+urlencode({"a": "b"}, quote_via=quote_plus)

stdlib/ssl.pyi

@@ -28,7 +28,7 @@ from _ssl import (
 from _typeshed import ReadableBuffer, StrOrBytesPath, WriteableBuffer
 from collections.abc import Callable, Iterable
 from typing import Any, Literal, NamedTuple, TypedDict, overload, type_check_only
-from typing_extensions import Never, Self, TypeAlias
+from typing_extensions import Never, Self, TypeAlias, deprecated
 
 if sys.version_info >= (3, 13):
     from _ssl import HAS_PSK as HAS_PSK
@@ -369,7 +369,12 @@ class SSLSocket(socket.socket):
     def compression(self) -> str | None: ...
     def get_channel_binding(self, cb_type: str = "tls-unique") -> bytes | None: ...
     def selected_alpn_protocol(self) -> str | None: ...
-    def selected_npn_protocol(self) -> str | None: ...
+    if sys.version_info >= (3, 10):
+        @deprecated("Deprecated in 3.10. Use ALPN instead.")
+        def selected_npn_protocol(self) -> str | None: ...
+    else:
+        def selected_npn_protocol(self) -> str | None: ...
+
     def accept(self) -> tuple[SSLSocket, socket._RetAddress]: ...
     def unwrap(self) -> socket.socket: ...
     def version(self) -> str | None: ...
@@ -434,7 +439,12 @@ class SSLContext(_SSLContext):
     def set_default_verify_paths(self) -> None: ...
     def set_ciphers(self, cipherlist: str, /) -> None: ...
     def set_alpn_protocols(self, alpn_protocols: Iterable[str]) -> None: ...
-    def set_npn_protocols(self, npn_protocols: Iterable[str]) -> None: ...
+    if sys.version_info >= (3, 10):
+        @deprecated("Deprecated in 3.10. Use ALPN instead.")
+        def set_npn_protocols(self, npn_protocols: Iterable[str]) -> None: ...
+    else:
+        def set_npn_protocols(self, npn_protocols: Iterable[str]) -> None: ...
+
     def set_servername_callback(self, server_name_callback: _SrvnmeCbType | None) -> None: ...
     def load_dh_params(self, path: str, /) -> None: ...
     def set_ecdh_curve(self, name: str, /) -> None: ...
@@ -475,7 +485,12 @@ class SSLObject:
     @overload
     def getpeercert(self, binary_form: bool) -> _PeerCertRetType: ...
     def selected_alpn_protocol(self) -> str | None: ...
-    def selected_npn_protocol(self) -> str | None: ...
+    if sys.version_info >= (3, 10):
+        @deprecated("Deprecated in 3.10. Use ALPN instead.")
+        def selected_npn_protocol(self) -> str | None: ...
+    else:
+        def selected_npn_protocol(self) -> str | None: ...
+
     def cipher(self) -> tuple[str, str, int] | None: ...
     def shared_ciphers(self) -> list[tuple[str, str, int]] | None: ...
     def compression(self) -> str | None: ...

stdlib/urllib/parse.pyi

@@ -1,7 +1,7 @@
 import sys
-from collections.abc import Callable, Iterable, Mapping, Sequence
+from collections.abc import Iterable, Mapping, Sequence
 from types import GenericAlias
-from typing import Any, AnyStr, Generic, Literal, NamedTuple, TypeVar, overload
+from typing import Any, AnyStr, Generic, Literal, NamedTuple, Protocol, overload, type_check_only
 from typing_extensions import TypeAlias
 
 __all__ = [
@@ -132,38 +132,32 @@ def urldefrag(url: str) -> DefragResult: ...
 @overload
 def urldefrag(url: bytes | bytearray | None) -> DefragResultBytes: ...
 
-_Q = TypeVar("_Q", bound=str | Iterable[int])
+# The values are passed through `str()` (unless they are bytes), so anything is valid.
 _QueryType: TypeAlias = (
-    Mapping[Any, Any] | Mapping[Any, Sequence[Any]] | Sequence[tuple[Any, Any]] | Sequence[tuple[Any, Sequence[Any]]]
+    Mapping[str, object]
+    | Mapping[bytes, object]
+    | Mapping[str | bytes, object]
+    | Mapping[str, Sequence[object]]
+    | Mapping[bytes, Sequence[object]]
+    | Mapping[str | bytes, Sequence[object]]
+    | Sequence[tuple[str | bytes, object]]
+    | Sequence[tuple[str | bytes, Sequence[object]]]
 )
 
-@overload
-def urlencode(
-    query: _QueryType,
-    doseq: bool = False,
-    safe: str = "",
-    encoding: str | None = None,
-    errors: str | None = None,
-    quote_via: Callable[[AnyStr, str, str, str], str] = ...,
-) -> str: ...
-@overload
-def urlencode(
-    query: _QueryType,
-    doseq: bool,
-    safe: _Q,
-    encoding: str | None = None,
-    errors: str | None = None,
-    quote_via: Callable[[AnyStr, _Q, str, str], str] = ...,
-) -> str: ...
-@overload
+@type_check_only
+class _QuoteVia(Protocol):
+    @overload
+    def __call__(self, string: str, safe: str | bytes, encoding: str, errors: str, /) -> str: ...
+    @overload
+    def __call__(self, string: bytes, safe: str | bytes, /) -> str: ...
+
 def urlencode(
     query: _QueryType,
     doseq: bool = False,
-    *,
-    safe: _Q,
+    safe: str | bytes = "",
     encoding: str | None = None,
     errors: str | None = None,
-    quote_via: Callable[[AnyStr, _Q, str, str], str] = ...,
+    quote_via: _QuoteVia = ...,
 ) -> str: ...
 def urljoin(base: AnyStr, url: AnyStr | None, allow_fragments: bool = True) -> AnyStr: ...
 @overload

stubs/Markdown/markdown/util.pyi

@@ -1,3 +1,4 @@
+import sys
 from collections.abc import Iterator
 from re import Pattern
 from typing import Final, Generic, TypedDict, TypeVar, overload
@@ -18,7 +19,13 @@ HTML_PLACEHOLDER_RE: Final[Pattern[str]]
 TAG_PLACEHOLDER: Final[str]
 RTL_BIDI_RANGES: Final[tuple[tuple[str, str], tuple[str, str]]]
 
-def get_installed_extensions(): ...
+if sys.version_info >= (3, 10):
+    from importlib import metadata
+    def get_installed_extensions() -> metadata.EntryPoints: ...
+
+else:
+    def get_installed_extensions(): ...
+
 def deprecated(message: str, stacklevel: int = 2): ...
 @overload
 def parseBoolValue(value: str) -> bool: ...

stubs/flake8-builtins/METADATA.toml

@@ -1,6 +1,3 @@
 version = "2.5.*"
 upstream_repository = "https://github.com/gforcada/flake8-builtins"
-partial_stub = true
-
-[tool.stubtest]
-ignore_missing_stub = true
+requires = ["types-flake8"]

stubs/flake8-builtins/flake8_builtins.pyi

@@ -1,12 +1,12 @@
 import ast
 from argparse import Namespace
-from binascii import Incomplete
 from collections.abc import Iterator
 from typing import ClassVar
 from typing_extensions import TypeAlias
 
+from flake8.options.manager import OptionManager
+
 _Error: TypeAlias = tuple[int, int, str, type[BuiltinsChecker]]
-_OptionManager: TypeAlias = Incomplete  # flake8.options.manager.OptionManager
 
 class BuiltinsChecker:
     name: ClassVar[str]
@@ -24,7 +24,7 @@ class BuiltinsChecker:
 
     def __init__(self, tree: ast.AST, filename: str) -> None: ...
     @classmethod
-    def add_options(cls, option_manager: _OptionManager) -> None: ...
+    def add_options(cls, option_manager: OptionManager) -> None: ...
     @classmethod
     def parse_options(cls, options: Namespace) -> None: ...
     def run(self) -> Iterator[_Error]: ...