Merge branch 'main' into fpdf2-2.8.5

Author: srittau

stdlib/contextlib.pyi

@@ -4,7 +4,7 @@ from _typeshed import FileDescriptorOrPath, Unused
 from abc import ABC, abstractmethod
 from collections.abc import AsyncGenerator, AsyncIterator, Awaitable, Callable, Generator, Iterator
 from types import TracebackType
-from typing import IO, Any, Generic, Protocol, TypeVar, overload, runtime_checkable, type_check_only
+from typing import Any, Generic, Protocol, TypeVar, overload, runtime_checkable, type_check_only
 from typing_extensions import ParamSpec, Self, TypeAlias
 
 __all__ = [
@@ -30,7 +30,6 @@ if sys.version_info >= (3, 11):
 
 _T = TypeVar("_T")
 _T_co = TypeVar("_T_co", covariant=True)
-_T_io = TypeVar("_T_io", bound=IO[str] | None)
 _ExitT_co = TypeVar("_ExitT_co", covariant=True, bound=bool | None, default=bool | None)
 _F = TypeVar("_F", bound=Callable[..., Any])
 _G_co = TypeVar("_G_co", bound=Generator[Any, Any, Any] | AsyncGenerator[Any, Any], covariant=True)
@@ -141,14 +140,24 @@ class suppress(AbstractContextManager[None, bool]):
         self, exctype: type[BaseException] | None, excinst: BaseException | None, exctb: TracebackType | None
     ) -> bool: ...
 
-class _RedirectStream(AbstractContextManager[_T_io, None]):
-    def __init__(self, new_target: _T_io) -> None: ...
+# This is trying to describe what is needed for (most?) uses
+# of `redirect_stdout` and `redirect_stderr`.
+# https://github.com/python/typeshed/issues/14903
+@type_check_only
+class _SupportsRedirect(Protocol):
+    def write(self, s: str, /) -> int: ...
+    def flush(self) -> None: ...
+
+_SupportsRedirectT = TypeVar("_SupportsRedirectT", bound=_SupportsRedirect | None)
+
+class _RedirectStream(AbstractContextManager[_SupportsRedirectT, None]):
+    def __init__(self, new_target: _SupportsRedirectT) -> None: ...
     def __exit__(
         self, exctype: type[BaseException] | None, excinst: BaseException | None, exctb: TracebackType | None
     ) -> None: ...
 
-class redirect_stdout(_RedirectStream[_T_io]): ...
-class redirect_stderr(_RedirectStream[_T_io]): ...
+class redirect_stdout(_RedirectStream[_SupportsRedirectT]): ...
+class redirect_stderr(_RedirectStream[_SupportsRedirectT]): ...
 
 class _BaseExitStack(Generic[_ExitT_co]):
     def enter_context(self, cm: AbstractContextManager[_T, _ExitT_co]) -> _T: ...

stubs/Deprecated/METADATA.toml

@@ -1,3 +1,3 @@
-version = "~=1.2.15"
+version = "~=1.3.1"
 upstream_repository = "https://github.com/tantale/deprecated"
 requires = []

stubs/Deprecated/deprecated/__init__.pyi

@@ -1,4 +1,9 @@
+from typing import Final
+
 from .classic import deprecated as deprecated
+from .params import deprecated_params as deprecated_params
 
-__credits__: str
-__date__: str
+__version__: Final[str]
+__author__: Final[str]
+__date__: Final[str]
+__credits__: Final[str]

stubs/Deprecated/deprecated/params.pyi

@@ -0,0 +1,20 @@
+from collections.abc import Callable, Iterable
+from inspect import Signature
+from typing import Any, TypeVar
+from typing_extensions import ParamSpec
+
+_P = ParamSpec("_P")
+_R = TypeVar("_R")
+
+class DeprecatedParams:
+    messages: dict[str, str]
+    category: type[Warning]
+    def __init__(self, param: str | dict[str, str], reason: str = "", category: type[Warning] = ...) -> None: ...
+    def populate_messages(self, param: str | dict[str, str], reason: str = "") -> None: ...
+    def check_params(
+        self, signature: Signature, *args: Any, **kwargs: Any  # args and kwargs passing to Signature.bind method
+    ) -> list[str]: ...
+    def warn_messages(self, messages: Iterable[str]) -> None: ...
+    def __call__(self, f: Callable[_P, _R]) -> Callable[_P, _R]: ...
+
+deprecated_params = DeprecatedParams

stubs/aws-xray-sdk/METADATA.toml

@@ -1,2 +1,2 @@
-version = "2.14.*"
+version = "2.15.*"
 upstream_repository = "https://github.com/aws/aws-xray-sdk-python"

stubs/aws-xray-sdk/aws_xray_sdk/ext/psycopg/__init__.pyi

@@ -0,0 +1,3 @@
+from .patch import patch as patch
+
+__all__ = ["patch"]

stubs/aws-xray-sdk/aws_xray_sdk/ext/psycopg/patch.pyi

@@ -0,0 +1 @@
+def patch() -> None: ...

stubs/braintree/braintree/address.pyi

@@ -1,7 +1,9 @@
 from _typeshed import Incomplete
 from typing import Final
 
+from braintree.error_result import ErrorResult
 from braintree.resource import Resource
+from braintree.successful_result import SuccessfulResult
 
 class Address(Resource):
     class ShippingMethod:
@@ -14,13 +16,15 @@ class Address(Resource):
         PickupInStore: Final = "pickup_in_store"
 
     @staticmethod
-    def create(params: dict[str, Incomplete] | None = None): ...
+    def create(params: dict[str, Incomplete] | None = None) -> SuccessfulResult | ErrorResult | None: ...
     @staticmethod
-    def delete(customer_id: str, address_id: str): ...
+    def delete(customer_id: str, address_id: str) -> SuccessfulResult: ...
     @staticmethod
-    def find(customer_id: str, address_id: str): ...
+    def find(customer_id: str, address_id: str) -> Address: ...
     @staticmethod
-    def update(customer_id: str, address_id: str, params: dict[str, Incomplete] | None = None): ...
+    def update(
+        customer_id: str, address_id: str, params: dict[str, Incomplete] | None = None
+    ) -> SuccessfulResult | ErrorResult | None: ...
     @staticmethod
     def create_signature() -> list[str | dict[str, list[str]]]: ...
     @staticmethod

stubs/braintree/braintree/address_gateway.pyi

@@ -1,13 +1,14 @@
 from _typeshed import Incomplete
 
 from braintree.address import Address
+from braintree.braintree_gateway import BraintreeGateway
 from braintree.error_result import ErrorResult
 from braintree.successful_result import SuccessfulResult
 
 class AddressGateway:
-    gateway: Incomplete
+    gateway: BraintreeGateway
     config: Incomplete
-    def __init__(self, gateway) -> None: ...
+    def __init__(self, gateway: BraintreeGateway) -> None: ...
     def create(self, params: dict[str, Incomplete] | None = None) -> SuccessfulResult | ErrorResult | None: ...
     def delete(self, customer_id: str, address_id: str) -> SuccessfulResult: ...
     def find(self, customer_id: str, address_id: str) -> Address: ...

stubs/braintree/braintree/client_token.pyi

@@ -1,5 +1,9 @@
+from _typeshed import Incomplete
+
+from braintree.braintree_gateway import BraintreeGateway
+
 class ClientToken:
     @staticmethod
-    def generate(params=None, gateway=None): ...
+    def generate(params: dict[str, Incomplete] | None = None, gateway: BraintreeGateway | None = None) -> str: ...
     @staticmethod
     def generate_signature() -> list[str | dict[str, list[str]]]: ...