Merge branch 'main' into cachetools

Author: ashm-dev

CONTRIBUTING.md

@@ -311,7 +311,7 @@ def foo(x: Incomplete | None) -> list[Incomplete]: ...
 ### What to do when a project's documentation and implementation disagree
 
 Type stubs are meant to be external type annotations for a given
-library.  While they are useful documentation in its own merit, they
+library.  While they are useful documentation in their own right, they
 augment the project's concrete implementation, not the project's
 documentation.  Whenever you find them disagreeing, model the type
 information after the actual implementation and file an issue on the

stdlib/@tests/stubtest_allowlists/darwin-py313.txt

@@ -3,3 +3,10 @@
 # =======
 
 (mmap.MAP_32BIT)?  # Exists locally on MacOS but not on GitHub
+
+# ================
+# Unclear problems
+# ================
+
+# Added in 3.11.1, flagged by stubtest on Python < 3.14 for unknown reasons
+errno.ENOTCAPABLE

stdlib/@tests/stubtest_allowlists/linux-py39.txt

@@ -6,6 +6,12 @@
 # while being inspected by stubtest. Fixed in Python 3.10.
 select.epoll.register
 
+# According to stubtest, these are sometimes not present at runtime, starting
+# with Python 3.9.24. Which is not true.
+(_frozen_importlib_external.PathFinder.find_distributions)?
+(importlib._bootstrap_external.PathFinder.find_distributions)?
+(importlib.machinery.PathFinder.find_distributions)?
+
 
 # =============================================================
 # Allowlist entries that cannot or should not be fixed; <= 3.12

stdlib/builtins.pyi

@@ -2058,6 +2058,10 @@ class BaseException:
     def __new__(cls, *args: Any, **kwds: Any) -> Self: ...
     def __setstate__(self, state: dict[str, Any] | None, /) -> None: ...
     def with_traceback(self, tb: TracebackType | None, /) -> Self: ...
+    # Necessary for security-focused static analyzers (e.g, pysa)
+    # See https://github.com/python/typeshed/pull/14900
+    def __str__(self) -> str: ...  # noqa: Y029
+    def __repr__(self) -> str: ...  # noqa: Y029
     if sys.version_info >= (3, 11):
         # only present after add_note() is called
         __notes__: list[str]

stdlib/cmath.pyi

@@ -23,7 +23,7 @@ def exp(z: _C, /) -> complex: ...
 def isclose(a: _C, b: _C, *, rel_tol: SupportsFloat = 1e-09, abs_tol: SupportsFloat = 0.0) -> bool: ...
 def isinf(z: _C, /) -> bool: ...
 def isnan(z: _C, /) -> bool: ...
-def log(x: _C, base: _C = ..., /) -> complex: ...
+def log(z: _C, base: _C = ..., /) -> complex: ...
 def log10(z: _C, /) -> complex: ...
 def phase(z: _C, /) -> float: ...
 def polar(z: _C, /) -> tuple[float, float]: ...

stdlib/turtle.pyi

@@ -221,16 +221,20 @@ class Terminator(Exception): ...
 class TurtleGraphicsError(Exception): ...
 
 class Shape:
-    def __init__(self, type_: str, data: _PolygonCoords | PhotoImage | None = None) -> None: ...
+    def __init__(
+        self, type_: Literal["polygon", "image", "compound"], data: _PolygonCoords | PhotoImage | None = None
+    ) -> None: ...
     def addcomponent(self, poly: _PolygonCoords, fill: _Color, outline: _Color | None = None) -> None: ...
 
 class TurtleScreen(TurtleScreenBase):
-    def __init__(self, cv: Canvas, mode: str = "standard", colormode: float = 1.0, delay: int = 10) -> None: ...
+    def __init__(
+        self, cv: Canvas, mode: Literal["standard", "logo", "world"] = "standard", colormode: float = 1.0, delay: int = 10
+    ) -> None: ...
     def clear(self) -> None: ...
     @overload
     def mode(self, mode: None = None) -> str: ...
     @overload
-    def mode(self, mode: str) -> None: ...
+    def mode(self, mode: Literal["standard", "logo", "world"]) -> None: ...
     def setworldcoordinates(self, llx: float, lly: float, urx: float, ury: float) -> None: ...
     def register_shape(self, name: str, shape: _PolygonCoords | Shape | None = None) -> None: ...
     @overload
@@ -289,7 +293,7 @@ class TNavigator:
     DEFAULT_MODE: str
     DEFAULT_ANGLEOFFSET: int
     DEFAULT_ANGLEORIENT: int
-    def __init__(self, mode: str = "standard") -> None: ...
+    def __init__(self, mode: Literal["standard", "logo", "world"] = "standard") -> None: ...
     def reset(self) -> None: ...
     def degrees(self, fullcircle: float = 360.0) -> None: ...
     def radians(self) -> None: ...
@@ -333,11 +337,11 @@ class TNavigator:
     seth = setheading
 
 class TPen:
-    def __init__(self, resizemode: str = "noresize") -> None: ...
+    def __init__(self, resizemode: Literal["auto", "user", "noresize"] = "noresize") -> None: ...
     @overload
     def resizemode(self, rmode: None = None) -> str: ...
     @overload
-    def resizemode(self, rmode: str) -> None: ...
+    def resizemode(self, rmode: Literal["auto", "user", "noresize"]) -> None: ...
     @overload
     def pensize(self, width: None = None) -> int: ...
     @overload
@@ -389,7 +393,7 @@ class TPen:
         fillcolor: _Color = ...,
         pensize: int = ...,
         speed: int = ...,
-        resizemode: str = ...,
+        resizemode: Literal["auto", "user", "noresize"] = ...,
         stretchfactor: tuple[float, float] = ...,
         outline: int = ...,
         tilt: float = ...,
@@ -524,7 +528,7 @@ def clear() -> None: ...
 @overload
 def mode(mode: None = None) -> str: ...
 @overload
-def mode(mode: str) -> None: ...
+def mode(mode: Literal["standard", "logo", "world"]) -> None: ...
 def setworldcoordinates(llx: float, lly: float, urx: float, ury: float) -> None: ...
 def register_shape(name: str, shape: _PolygonCoords | Shape | None = None) -> None: ...
 @overload
@@ -634,7 +638,7 @@ seth = setheading
 @overload
 def resizemode(rmode: None = None) -> str: ...
 @overload
-def resizemode(rmode: str) -> None: ...
+def resizemode(rmode: Literal["auto", "user", "noresize"]) -> None: ...
 @overload
 def pensize(width: None = None) -> int: ...
 @overload
@@ -683,7 +687,7 @@ def pen(
     fillcolor: _Color = ...,
     pensize: int = ...,
     speed: int = ...,
-    resizemode: str = ...,
+    resizemode: Literal["auto", "user", "noresize"] = ...,
     stretchfactor: tuple[float, float] = ...,
     outline: int = ...,
     tilt: float = ...,

stubs/braintree/METADATA.toml

@@ -1,2 +1,2 @@
-version = "4.38.*"
+version = "4.39.*"
 upstream_repository = "https://github.com/braintree/braintree_python"

stubs/braintree/braintree/__init__.pyi

@@ -7,6 +7,13 @@ from braintree.amex_express_checkout_card import AmexExpressCheckoutCard as Amex
 from braintree.android_pay_card import AndroidPayCard as AndroidPayCard
 from braintree.apple_pay_card import ApplePayCard as ApplePayCard
 from braintree.apple_pay_gateway import ApplePayGateway as ApplePayGateway
+from braintree.bank_account_instant_verification_gateway import (
+    BankAccountInstantVerificationGateway as BankAccountInstantVerificationGateway,
+)
+from braintree.bank_account_instant_verification_jwt import BankAccountInstantVerificationJwt as BankAccountInstantVerificationJwt
+from braintree.bank_account_instant_verification_jwt_request import (
+    BankAccountInstantVerificationJwtRequest as BankAccountInstantVerificationJwtRequest,
+)
 from braintree.blik_alias import BlikAlias as BlikAlias
 from braintree.braintree_gateway import BraintreeGateway as BraintreeGateway
 from braintree.client_token import ClientToken as ClientToken
@@ -62,10 +69,12 @@ from braintree.paypal_payment_resource import PayPalPaymentResource as PayPalPay
 from braintree.plan import Plan as Plan
 from braintree.plan_gateway import PlanGateway as PlanGateway
 from braintree.processor_response_types import ProcessorResponseTypes as ProcessorResponseTypes
+from braintree.receiver import Receiver as Receiver
 from braintree.resource_collection import ResourceCollection as ResourceCollection
 from braintree.risk_data import RiskData as RiskData
 from braintree.samsung_pay_card import SamsungPayCard as SamsungPayCard
 from braintree.search import Search as Search
+from braintree.sender import Sender as Sender
 from braintree.sepa_direct_debit_account import SepaDirectDebitAccount as SepaDirectDebitAccount
 from braintree.settlement_batch_summary import SettlementBatchSummary as SettlementBatchSummary
 from braintree.signature_service import SignatureService as SignatureService
@@ -84,9 +93,11 @@ from braintree.transaction_details import TransactionDetails as TransactionDetai
 from braintree.transaction_gateway import TransactionGateway as TransactionGateway
 from braintree.transaction_line_item import TransactionLineItem as TransactionLineItem
 from braintree.transaction_search import TransactionSearch as TransactionSearch
+from braintree.transaction_us_bank_account_request import TransactionUsBankAccountRequest as TransactionUsBankAccountRequest
 from braintree.transfer import Transfer as Transfer
 from braintree.unknown_payment_method import UnknownPaymentMethod as UnknownPaymentMethod
 from braintree.us_bank_account import UsBankAccount as UsBankAccount
+from braintree.us_bank_account_verification import UsBankAccountVerification as UsBankAccountVerification
 from braintree.validation_error_collection import ValidationErrorCollection as ValidationErrorCollection
 from braintree.venmo_account import VenmoAccount as VenmoAccount
 from braintree.venmo_profile_data import VenmoProfileData as VenmoProfileData

stubs/braintree/braintree/bank_account_instant_verification_gateway.pyi

@@ -0,0 +1,13 @@
+from _typeshed import Incomplete
+from typing import Final
+
+from braintree.error_result import ErrorResult
+from braintree.successful_result import SuccessfulResult
+
+class BankAccountInstantVerificationGateway:
+    gateway: Incomplete
+    config: Incomplete
+    graphql_client: Incomplete
+    CREATE_JWT_MUTATION: Final[str]
+    def __init__(self, gateway) -> None: ...
+    def create_jwt(self, request) -> SuccessfulResult | ErrorResult: ...

stubs/braintree/braintree/bank_account_instant_verification_jwt.pyi

@@ -0,0 +1,8 @@
+from braintree.attribute_getter import AttributeGetter
+
+class BankAccountInstantVerificationJwt(AttributeGetter):
+    def __init__(self, jwt) -> None: ...
+    @property
+    def jwt(self): ...
+    @jwt.setter
+    def jwt(self, value) -> None: ...