Skip to content

Commit 5ab38d6

Browse files
authored
Fix annotations for Python 3.15.0-beta.4 (#16060)
1 parent 5fb03c5 commit 5ab38d6

3 files changed

Lines changed: 26 additions & 4 deletions

File tree

stdlib/_winapi.pyi

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,3 +312,6 @@ if sys.platform == "win32":
312312
if sys.version_info >= (3, 12):
313313
def CopyFile2(existing_file_name: str, new_file_name: str, flags: int, progress_routine: int | None = None) -> int: ...
314314
def NeedCurrentDirectoryForExePath(exe_name: str, /) -> bool: ...
315+
316+
if sys.version_info >= (3, 15):
317+
def GetTickCount64() -> int: ...

stdlib/concurrent/futures/process.pyi

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,12 @@ class _ExecutorManagerThread(Thread):
146146
def wait_result_broken_or_wakeup(self) -> tuple[Any, bool, str]: ...
147147
def process_result_item(self, result_item: int | _ResultItem) -> None: ...
148148
def is_shutting_down(self) -> bool: ...
149-
def terminate_broken(self, cause: str) -> None: ...
149+
150+
if sys.version_info >= (3, 15):
151+
def terminate_broken(self, cause: str, bpe_message: str | None = None) -> None: ...
152+
else:
153+
def terminate_broken(self, cause: str) -> None: ...
154+
150155
def flag_executor_shutting_down(self) -> None: ...
151156
def shutdown_workers(self) -> None: ...
152157
def join_executor_internals(self) -> None: ...

stdlib/imaplib.pyi

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,20 @@ class IMAP4:
8484
if sys.version_info >= (3, 14):
8585
def idle(self, duration: float | None = None) -> Idler: ...
8686

87-
def list(self, directory: str = '""', pattern: str = "*") -> tuple[str, _AnyResponseData]: ...
87+
if sys.version_info >= (3, 15):
88+
def list(self, directory: str = "", pattern: str = "*") -> tuple[str, _AnyResponseData]: ...
89+
else:
90+
def list(self, directory: str = '""', pattern: str = "*") -> tuple[str, _AnyResponseData]: ...
91+
8892
def login(self, user: str, password: str) -> tuple[Literal["OK"], _list[bytes]]: ...
8993
def login_cram_md5(self, user: str, password: str) -> _CommandResults: ...
9094
def logout(self) -> tuple[str, _AnyResponseData]: ...
91-
def lsub(self, directory: str = '""', pattern: str = "*") -> _CommandResults: ...
95+
96+
if sys.version_info >= (3, 15):
97+
def lsub(self, directory: str = "", pattern: str = "*") -> _CommandResults: ...
98+
else:
99+
def lsub(self, directory: str = '""', pattern: str = "*") -> _CommandResults: ...
100+
92101
def myrights(self, mailbox: str) -> _CommandResults: ...
93102
def namespace(self) -> _CommandResults: ...
94103
def noop(self) -> tuple[str, _list[bytes]]: ...
@@ -98,7 +107,12 @@ class IMAP4:
98107
def search(self, charset: str | None, *criteria: str) -> _CommandResults: ...
99108
def select(self, mailbox: str = "INBOX", readonly: bool = False) -> tuple[str, _list[bytes | None]]: ...
100109
def setacl(self, mailbox: str, who: str, what: str) -> _CommandResults: ...
101-
def setannotation(self, *args: str) -> _CommandResults: ...
110+
111+
if sys.version_info >= (3, 15):
112+
def setannotation(self, mailbox: str | bytes, *args: str) -> _CommandResults: ...
113+
else:
114+
def setannotation(self, *args: str) -> _CommandResults: ...
115+
102116
def setquota(self, root: str, limits: str) -> _CommandResults: ...
103117
def sort(self, sort_criteria: str, charset: str, *search_criteria: str) -> _CommandResults: ...
104118
def starttls(self, ssl_context: Any | None = None) -> tuple[Literal["OK"], _list[None]]: ...

0 commit comments

Comments
 (0)