Merge branch 'main' into fix-frozen-importlib-external-py315

Author: srittau

pyrightconfig.stricter.json

@@ -78,6 +78,7 @@
         "stubs/protobuf",
         "stubs/psutil/psutil/__init__.pyi",
         "stubs/psycopg2",
+        "stubs/punq",
         "stubs/pyasn1",
         "stubs/Pygments",
         "stubs/PyMySQL",

stdlib/_winapi.pyi

@@ -312,3 +312,6 @@ if sys.platform == "win32":
     if sys.version_info >= (3, 12):
         def CopyFile2(existing_file_name: str, new_file_name: str, flags: int, progress_routine: int | None = None) -> int: ...
         def NeedCurrentDirectoryForExePath(exe_name: str, /) -> bool: ...
+
+    if sys.version_info >= (3, 15):
+        def GetTickCount64() -> int: ...

stdlib/collections/__init__.pyi

@@ -277,6 +277,7 @@ class deque(MutableSequence[_T]):
     def __iadd__(self, value: Iterable[_T], /) -> Self: ...
     def __add__(self, value: Self, /) -> Self: ...
     def __mul__(self, value: int, /) -> Self: ...
+    def __rmul__(self, value: int, /) -> Self: ...
     def __imul__(self, value: int, /) -> Self: ...
     def __lt__(self, value: deque[_T], /) -> bool: ...
     def __le__(self, value: deque[_T], /) -> bool: ...

stdlib/concurrent/futures/process.pyi

@@ -146,7 +146,12 @@ class _ExecutorManagerThread(Thread):
     def wait_result_broken_or_wakeup(self) -> tuple[Any, bool, str]: ...
     def process_result_item(self, result_item: int | _ResultItem) -> None: ...
     def is_shutting_down(self) -> bool: ...
-    def terminate_broken(self, cause: str) -> None: ...
+
+    if sys.version_info >= (3, 15):
+        def terminate_broken(self, cause: str, bpe_message: str | None = None) -> None: ...
+    else:
+        def terminate_broken(self, cause: str) -> None: ...
+
     def flag_executor_shutting_down(self) -> None: ...
     def shutdown_workers(self) -> None: ...
     def join_executor_internals(self) -> None: ...

stdlib/imaplib.pyi

@@ -84,11 +84,20 @@ class IMAP4:
     if sys.version_info >= (3, 14):
         def idle(self, duration: float | None = None) -> Idler: ...
 
-    def list(self, directory: str = '""', pattern: str = "*") -> tuple[str, _AnyResponseData]: ...
+    if sys.version_info >= (3, 15):
+        def list(self, directory: str = "", pattern: str = "*") -> tuple[str, _AnyResponseData]: ...
+    else:
+        def list(self, directory: str = '""', pattern: str = "*") -> tuple[str, _AnyResponseData]: ...
+
     def login(self, user: str, password: str) -> tuple[Literal["OK"], _list[bytes]]: ...
     def login_cram_md5(self, user: str, password: str) -> _CommandResults: ...
     def logout(self) -> tuple[str, _AnyResponseData]: ...
-    def lsub(self, directory: str = '""', pattern: str = "*") -> _CommandResults: ...
+
+    if sys.version_info >= (3, 15):
+        def lsub(self, directory: str = "", pattern: str = "*") -> _CommandResults: ...
+    else:
+        def lsub(self, directory: str = '""', pattern: str = "*") -> _CommandResults: ...
+
     def myrights(self, mailbox: str) -> _CommandResults: ...
     def namespace(self) -> _CommandResults: ...
     def noop(self) -> tuple[str, _list[bytes]]: ...
@@ -98,7 +107,12 @@ class IMAP4:
     def search(self, charset: str | None, *criteria: str) -> _CommandResults: ...
     def select(self, mailbox: str = "INBOX", readonly: bool = False) -> tuple[str, _list[bytes | None]]: ...
     def setacl(self, mailbox: str, who: str, what: str) -> _CommandResults: ...
-    def setannotation(self, *args: str) -> _CommandResults: ...
+
+    if sys.version_info >= (3, 15):
+        def setannotation(self, mailbox: str | bytes, *args: str) -> _CommandResults: ...
+    else:
+        def setannotation(self, *args: str) -> _CommandResults: ...
+
     def setquota(self, root: str, limits: str) -> _CommandResults: ...
     def sort(self, sort_criteria: str, charset: str, *search_criteria: str) -> _CommandResults: ...
     def starttls(self, ssl_context: Any | None = None) -> tuple[Literal["OK"], _list[None]]: ...

stdlib/math/__init__.pyi

@@ -90,7 +90,7 @@ def isqrt(n: SupportsIndex, /) -> int: ...
 def lcm(*integers: SupportsIndex) -> int: ...
 def ldexp(x: _SupportsFloatOrIndex, i: int, /) -> float: ...
 def lgamma(x: _SupportsFloatOrIndex, /) -> float: ...
-def log(x: _SupportsFloatOrIndex, base: _SupportsFloatOrIndex = ...) -> float: ...
+def log(x: _SupportsFloatOrIndex, base: _SupportsFloatOrIndex = ..., /) -> float: ...
 def log10(x: _SupportsFloatOrIndex, /) -> float: ...
 def log1p(x: _SupportsFloatOrIndex, /) -> float: ...
 def log2(x: _SupportsFloatOrIndex, /) -> float: ...

stubs/Authlib/METADATA.toml

@@ -1,3 +1,3 @@
-version = "1.6.11"
+version = "1.7.1"
 upstream-repository = "https://github.com/authlib/authlib"
 dependencies = ["cryptography"]

stubs/Authlib/authlib/deprecate.pyi

@@ -1,5 +1,3 @@
 class AuthlibDeprecationWarning(DeprecationWarning): ...
 
-def deprecate(
-    message: str, version: str | None = None, link_uid: str | None = None, link_file: str | None = None, stacklevel: int = 3
-) -> None: ...
+def deprecate(message: str, version: str | None = None, stacklevel: int = 3) -> None: ...

stubs/Authlib/authlib/integrations/base_client/async_openid.pyi

@@ -1,3 +1,4 @@
+from authlib.integrations.base_client.sync_openid import _LogoutData
 from authlib.oidc.core.claims import UserInfo
 
 __all__ = ["AsyncOpenIDMixin"]
@@ -6,3 +7,6 @@ class AsyncOpenIDMixin:
     async def fetch_jwk_set(self, force: bool = False): ...
     async def userinfo(self, **kwargs) -> UserInfo: ...
     async def parse_id_token(self, token, nonce, claims_options=None, claims_cls=None, leeway: int = 120) -> UserInfo: ...
+    async def create_logout_url(
+        self, post_logout_redirect_uri=None, id_token_hint=None, state=None, *, client_id=None, logout_hint=None, ui_locales=None
+    ) -> _LogoutData: ...

stubs/Authlib/authlib/integrations/base_client/sync_openid.pyi

@@ -1,7 +1,17 @@
+from _typeshed import Incomplete
+from typing import TypedDict, type_check_only
+
 from authlib.oidc.core.claims import UserInfo
 
+@type_check_only
+class _LogoutData(TypedDict):
+    url: str
+    state: Incomplete
+
 class OpenIDMixin:
     def fetch_jwk_set(self, force: bool = False): ...
     def userinfo(self, **kwargs) -> UserInfo: ...
     def parse_id_token(self, token, nonce, claims_options=None, claims_cls=None, leeway: int = 120) -> UserInfo | None: ...
-    def create_load_key(self): ...
+    def create_logout_url(
+        self, post_logout_redirect_uri=None, id_token_hint=None, state=None, *, client_id=None, logout_hint=None, ui_locales=None
+    ) -> _LogoutData: ...