From 6d204affc92eb099587a9390492efe197464201a Mon Sep 17 00:00:00 2001 From: Marcelo Duarte Date: Wed, 27 May 2026 01:38:00 -0300 Subject: [PATCH 1/2] msilib: fix type annotation --- stdlib/_msi.pyi | 2 +- stdlib/msilib/__init__.pyi | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/stdlib/_msi.pyi b/stdlib/_msi.pyi index edceed51bf9d..e5b408811ee7 100644 --- a/stdlib/_msi.pyi +++ b/stdlib/_msi.pyi @@ -52,7 +52,7 @@ if sys.platform == "win32": __init__: None # type: ignore[assignment] def UuidCreate() -> str: ... - def FCICreate(cabname: str, files: list[str], /) -> None: ... + def FCICreate(cabname: str, files: list[tuple[str, str]], /) -> None: ... def OpenDatabase(path: str, persist: int, /) -> _Database: ... def CreateRecord(count: int, /) -> _Record: ... diff --git a/stdlib/msilib/__init__.pyi b/stdlib/msilib/__init__.pyi index 622f585f5bee..fb583fe200e5 100644 --- a/stdlib/msilib/__init__.pyi +++ b/stdlib/msilib/__init__.pyi @@ -1,11 +1,12 @@ import sys -from collections.abc import Container, Iterable, Sequence +from collections.abc import Container, Iterable from types import ModuleType from typing import Any, Final if sys.platform == "win32": from _msi import * from _msi import _Database + from .sequence import _SequenceType AMD64: Final[bool] Win64: Final[bool] @@ -33,7 +34,7 @@ if sys.platform == "win32": class _Unspecified: ... def change_sequence( - seq: Sequence[tuple[str, str | None, int]], + seq: _SequenceType, action: str, seqno: int | type[_Unspecified] = ..., cond: str | type[_Unspecified] = ..., @@ -54,7 +55,7 @@ if sys.platform == "win32": index: int def __init__(self, name: str) -> None: ... def gen_id(self, file: str) -> str: ... - def append(self, full: str, file: str, logical: str) -> tuple[int, str]: ... + def append(self, full: str, file: str, logical: str | None) -> tuple[int, str] | None: ... def commit(self, db: _Database) -> None: ... _directories: set[str] @@ -62,7 +63,7 @@ if sys.platform == "win32": class Directory: db: _Database cab: CAB - basedir: str + basedir: Directory | None physical: str logical: str component: str | None @@ -75,7 +76,7 @@ if sys.platform == "win32": self, db: _Database, cab: CAB, - basedir: str, + basedir: Directory | None, physical: str, _logical: str, default: str, @@ -90,7 +91,7 @@ if sys.platform == "win32": uuid: str | None = None, ) -> None: ... def make_short(self, file: str) -> str: ... - def add_file(self, file: str, src: str | None = None, version: str | None = None, language: str | None = None) -> str: ... + def add_file(self, file: str, src: str | None = None, version: str | None = None, language: str | None = None) -> str | None: ... def glob(self, pattern: str, exclude: Container[str] | None = None) -> list[str]: ... def remove_pyc(self) -> None: ... @@ -146,8 +147,8 @@ if sys.platform == "win32": attr: int, title: str, first: str, - default: str, - cancel: str, + default: str | None, + cancel: str | None, ) -> None: ... def control( self, From 662baa3bfcf718090a11043799ca5382cfd77e3c Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 27 May 2026 04:46:55 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks --- stdlib/msilib/__init__.pyi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/stdlib/msilib/__init__.pyi b/stdlib/msilib/__init__.pyi index fb583fe200e5..259370f222c2 100644 --- a/stdlib/msilib/__init__.pyi +++ b/stdlib/msilib/__init__.pyi @@ -6,6 +6,7 @@ from typing import Any, Final if sys.platform == "win32": from _msi import * from _msi import _Database + from .sequence import _SequenceType AMD64: Final[bool] @@ -34,10 +35,7 @@ if sys.platform == "win32": class _Unspecified: ... def change_sequence( - seq: _SequenceType, - action: str, - seqno: int | type[_Unspecified] = ..., - cond: str | type[_Unspecified] = ..., + seq: _SequenceType, action: str, seqno: int | type[_Unspecified] = ..., cond: str | type[_Unspecified] = ... ) -> None: ... def add_data(db: _Database, table: str, values: Iterable[tuple[Any, ...]]) -> None: ... def add_stream(db: _Database, name: str, path: str) -> None: ... @@ -91,7 +89,9 @@ if sys.platform == "win32": uuid: str | None = None, ) -> None: ... def make_short(self, file: str) -> str: ... - def add_file(self, file: str, src: str | None = None, version: str | None = None, language: str | None = None) -> str | None: ... + def add_file( + self, file: str, src: str | None = None, version: str | None = None, language: str | None = None + ) -> str | None: ... def glob(self, pattern: str, exclude: Container[str] | None = None) -> list[str]: ... def remove_pyc(self) -> None: ...