python-msilib 0.3.0__cp313-cp313-win_arm64.whl → 0.4.0__cp313-cp313-win_arm64.whl

msilib/__init__.py

@@ -1,17 +1,139 @@
+"""Read and write Microsoft Installer files."""
+
 # Copyright (C) 2005 Martin v. Löwis
 # Licensed to PSF under a Contributor Agreement.
-from msilib._msi import *
+import contextlib
 import fnmatch
 import os
+import platform
 import re
 import string
-import sys
-
-__version__ = "0.3.0"
+from tempfile import mkstemp
+
+from msilib._msi import (
+    MSICOLINFO_NAMES,
+    MSICOLINFO_TYPES,
+    MSIDBOPEN_CREATE,
+    MSIDBOPEN_CREATEDIRECT,
+    MSIDBOPEN_DIRECT,
+    MSIDBOPEN_PATCHFILE,
+    MSIDBOPEN_READONLY,
+    MSIDBOPEN_TRANSACT,
+    MSIMODIFY_ASSIGN,
+    MSIMODIFY_DELETE,
+    MSIMODIFY_INSERT,
+    MSIMODIFY_INSERT_TEMPORARY,
+    MSIMODIFY_MERGE,
+    MSIMODIFY_REFRESH,
+    MSIMODIFY_REPLACE,
+    MSIMODIFY_SEEK,
+    MSIMODIFY_UPDATE,
+    MSIMODIFY_VALIDATE,
+    MSIMODIFY_VALIDATE_DELETE,
+    MSIMODIFY_VALIDATE_FIELD,
+    MSIMODIFY_VALIDATE_NEW,
+    PID_APPNAME,
+    PID_AUTHOR,
+    PID_CHARCOUNT,
+    PID_CODEPAGE,
+    PID_COMMENTS,
+    PID_CREATE_DTM,
+    PID_KEYWORDS,
+    PID_LASTAUTHOR,
+    PID_LASTPRINTED,
+    PID_LASTSAVE_DTM,
+    PID_PAGECOUNT,
+    PID_REVNUMBER,
+    PID_SECURITY,
+    PID_SUBJECT,
+    PID_TEMPLATE,
+    PID_TITLE,
+    PID_WORDCOUNT,
+    CreateRecord,
+    FCICreate,
+    MSIError,
+    OpenDatabase,
+    UuidCreate,
+)
 
-AMD64 = "AMD64" in sys.version
-# Keep msilib.Win64 around to preserve backwards compatibility.
-Win64 = AMD64
+__version__ = "0.4.0"
+
+__all__ = [
+    "CAB",
+    "MSICOLINFO_NAMES",
+    "MSICOLINFO_TYPES",
+    "MSIDBOPEN_CREATE",
+    "MSIDBOPEN_CREATEDIRECT",
+    "MSIDBOPEN_DIRECT",
+    "MSIDBOPEN_PATCHFILE",
+    "MSIDBOPEN_READONLY",
+    "MSIDBOPEN_TRANSACT",
+    "MSIMODIFY_ASSIGN",
+    "MSIMODIFY_DELETE",
+    "MSIMODIFY_INSERT",
+    "MSIMODIFY_INSERT_TEMPORARY",
+    "MSIMODIFY_MERGE",
+    "MSIMODIFY_REFRESH",
+    "MSIMODIFY_REPLACE",
+    "MSIMODIFY_SEEK",
+    "MSIMODIFY_UPDATE",
+    "MSIMODIFY_VALIDATE",
+    "MSIMODIFY_VALIDATE_DELETE",
+    "MSIMODIFY_VALIDATE_FIELD",
+    "MSIMODIFY_VALIDATE_NEW",
+    "PID_APPNAME",
+    "PID_AUTHOR",
+    "PID_CHARCOUNT",
+    "PID_CODEPAGE",
+    "PID_COMMENTS",
+    "PID_CREATE_DTM",
+    "PID_KEYWORDS",
+    "PID_LASTAUTHOR",
+    "PID_LASTPRINTED",
+    "PID_LASTSAVE_DTM",
+    "PID_PAGECOUNT",
+    "PID_REVNUMBER",
+    "PID_SECURITY",
+    "PID_SUBJECT",
+    "PID_TEMPLATE",
+    "PID_TITLE",
+    "PID_WORDCOUNT",
+    "Binary",
+    "Control",
+    "CreateRecord",
+    "Dialog",
+    "Directory",
+    "FCICreate",
+    "Feature",
+    "MSIError",
+    "OpenDatabase",
+    "RadioButtonGroup",
+    "Table",
+    "UuidCreate",
+    "add_data",
+    "add_stream",
+    "add_tables",
+    "change_sequence",
+    "datasizemask",
+    "gen_uuid",
+    "init_database",
+    "knownbits",
+    "make_id",
+    "type_binary",
+    "type_key",
+    "type_localizable",
+    "type_long",
+    "type_nullable",
+    "type_short",
+    "type_string",
+    "type_valid",
+    "typemask",
+]
+
+
+# Should work in windows, but also in mingw, cygwin, ...
+AMD64 = platform.machine() in ("x64", "x86_64", "AMD64")
+ARM64 = platform.machine() in ("aarch64", "arm64", "ARM64")
 
 # Partially taken from Wine
 datasizemask = 0x00FF
@@ -38,30 +160,27 @@ knownbits = (
 
 
 class Table:
-    def __init__(self, name):
+    def __init__(self, name) -> None:
         self.name = name
         self.fields = []
 
-    def add_field(self, index, name, type):
+    def add_field(self, index, name, type) -> None:
         self.fields.append((index, name, type))
 
-    def sql(self):
+    def sql(self) -> str:
         fields = []
         keys = []
         self.fields.sort()
         fields = [None] * len(self.fields)
-        for index, name, type in self.fields:
-            index -= 1
-            unk = type & ~knownbits
+        for index, name, ftype in self.fields:
+            idx = index - 1
+            unk = ftype & ~knownbits
             if unk:
-                print("%s.%s unknown bits %x" % (self.name, name, unk))
-            size = type & datasizemask
-            dtype = type & typemask
+                print(f"{self.name}.{name} unknown bits {unk:x}")
+            size = ftype & datasizemask
+            dtype = ftype & typemask
             if dtype == type_string:
-                if size:
-                    tname = "CHAR(%d)" % size
-                else:
-                    tname = "CHAR"
+                tname = f"CHAR({size})" if size else "CHAR"
             elif dtype == type_short:
                 assert size == 2
                 tname = "SHORT"
@@ -73,25 +192,18 @@ class Table:
                 tname = "OBJECT"
             else:
                 tname = "unknown"
-                print("%s.%sunknown integer type %d" % (self.name, name, size))
-            if type & type_nullable:
-                flags = ""
-            else:
-                flags = " NOT NULL"
-            if type & type_localizable:
+                print(f"{self.name}.{name} unknown integer type {size}")
+            flags = "" if ftype & type_nullable else " NOT NULL"
+            if ftype & type_localizable:
                 flags += " LOCALIZABLE"
-            fields[index] = "`%s` %s%s" % (name, tname, flags)
-            if type & type_key:
-                keys.append("`%s`" % name)
+            fields[idx] = f"`{name}` {tname}{flags}"
+            if ftype & type_key:
+                keys.append(f"`{name}`")
         fields = ", ".join(fields)
         keys = ", ".join(keys)
-        return "CREATE TABLE %s (%s PRIMARY KEY %s)" % (
-            self.name,
-            fields,
-            keys,
-        )
+        return f"CREATE TABLE {self.name} ({fields} PRIMARY KEY {keys})"
 
-    def create(self, db):
+    def create(self, db) -> None:
         v = db.OpenView(self.sql())
         v.Execute(None)
         v.Close()
@@ -101,8 +213,10 @@ class _Unspecified:
     pass
 
 
-def change_sequence(seq, action, seqno=_Unspecified, cond=_Unspecified):
-    "Change the sequence number of an action in a sequence list"
+def change_sequence(
+    seq, action, seqno=_Unspecified, cond=_Unspecified
+) -> None:
+    """Change the sequence number of an action in a sequence list."""
     for i in range(len(seq)):
         if seq[i][0] == action:
             if cond is _Unspecified:
@@ -111,11 +225,12 @@ def change_sequence(seq, action, seqno=_Unspecified, cond=_Unspecified):
                 seqno = seq[i][2]
             seq[i] = (action, cond, seqno)
             return
-    raise ValueError("Action not found in sequence")
+    msg = "Action not found in sequence"
+    raise ValueError(msg)
 
 
-def add_data(db, table, values):
-    v = db.OpenView("SELECT * FROM `%s`" % table)
+def add_data(db, table, values) -> None:
+    v = db.OpenView(f"SELECT * FROM `{table}`")
     count = v.GetColumnInfo(MSICOLINFO_NAMES).GetFieldCount()
     r = CreateRecord(count)
     for value in values:
@@ -131,24 +246,20 @@ def add_data(db, table, values):
             elif isinstance(field, Binary):
                 r.SetStream(i + 1, field.name)
             else:
-                raise TypeError(
-                    "Unsupported type %s" % field.__class__.__name__
-                )
+                msg = f"Unsupported type {field.__class__.__name__}"
+                raise TypeError(msg)
         try:
             v.Modify(MSIMODIFY_INSERT, r)
-        except Exception:
-            raise MSIError(
-                "Could not insert " + repr(values) + " into " + table
-            )
+        except Exception:  # noqa: BLE001
+            msg = f"Could not insert {values!r} into {table}"
+            raise MSIError(msg) from None
 
         r.ClearData()
     v.Close()
 
 
-def add_stream(db, name, path):
-    v = db.OpenView(
-        "INSERT INTO _Streams (Name, Data) VALUES ('%s', ?)" % name
-    )
+def add_stream(db, name, path) -> None:
+    v = db.OpenView(f"INSERT INTO _Streams (Name, Data) VALUES ('{name}', ?)")
     r = CreateRecord(1)
     r.SetStream(1, path)
     v.Execute(r)
@@ -158,10 +269,8 @@ def add_stream(db, name, path):
 def init_database(
     name, schema, ProductName, ProductCode, ProductVersion, Manufacturer
 ):
-    try:
+    with contextlib.suppress(OSError):
         os.unlink(name)
-    except OSError:
-        pass
     ProductCode = ProductCode.upper()
     # Create the database
     db = OpenDatabase(name, MSIDBOPEN_CREATE)
@@ -169,14 +278,17 @@ def init_database(
     for t in schema.tables:
         t.create(db)
     # Fill the validation table
-    add_data(db, "_Validation", schema._Validation_records)
+    add_data(db, "_Validation", schema._Validation_records)  # noqa: SLF001
     # Initialize the summary information, allowing at most 20 properties
     si = db.GetSummaryInformation(20)
     si.SetProperty(PID_TITLE, "Installation Database")
     si.SetProperty(PID_SUBJECT, ProductName)
     si.SetProperty(PID_AUTHOR, Manufacturer)
+    # https://learn.microsoft.com/en-us/windows/win32/msi/template-summary
     if AMD64:
         si.SetProperty(PID_TEMPLATE, "x64;1033")
+    elif ARM64:
+        si.SetProperty(PID_TEMPLATE, "Arm64;1033")
     else:
         si.SetProperty(PID_TEMPLATE, "Intel;1033")
     si.SetProperty(PID_REVNUMBER, gen_uuid())
@@ -202,53 +314,52 @@ def init_database(
     return db
 
 
-def add_tables(db, module):
+def add_tables(db, module) -> None:
     for table in module.tables:
         add_data(db, table, getattr(module, table))
 
 
-def make_id(str):
+def make_id(value: str) -> str:
     identifier_chars = string.ascii_letters + string.digits + "._"
-    str = "".join([c if c in identifier_chars else "_" for c in str])
-    if str[0] in (string.digits + "."):
-        str = "_" + str
-    assert re.match("^[A-Za-z_][A-Za-z0-9_.]*$", str), "FILE" + str
-    return str
+    value = "".join([c if c in identifier_chars else "_" for c in value])
+    if value[0] in (string.digits + "."):
+        value = "_" + value
+    assert re.match("^[A-Za-z_][A-Za-z0-9_.]*$", value), "FILE" + value
+    return value
 
 
-def gen_uuid():
+def gen_uuid() -> str:
     return "{" + UuidCreate().upper() + "}"
 
 
 class CAB:
-    def __init__(self, name):
+    def __init__(self, name) -> None:
         self.name = name
         self.files = []
         self.filenames = set()
         self.index = 0
 
-    def gen_id(self, file):
+    def gen_id(self, file) -> str:
         logical = _logical = make_id(file)
         pos = 1
         while logical in self.filenames:
-            logical = "%s.%d" % (_logical, pos)
+            logical = f"{_logical}.{pos}"
             pos += 1
         self.filenames.add(logical)
         return logical
 
-    def append(self, full, file, logical):
+    def append(self, full, file, logical) -> tuple[int, str]:
         if os.path.isdir(full):
-            return
+            return None
         if not logical:
             logical = self.gen_id(file)
         self.index += 1
         self.files.append((full, logical))
         return self.index, logical
 
-    def commit(self, db):
-        from tempfile import mktemp
-
-        filename = mktemp()
+    def commit(self, db) -> None:
+        fd, filename = mkstemp()
+        os.close(fd)
         FCICreate(filename, self.files)
         add_data(
             db, "Media", [(1, self.index, None, "#" + self.name, None, None)]
@@ -271,20 +382,22 @@ class Directory:
         _logical,
         default,
         componentflags=None,
-    ):
-        """Create a new directory in the Directory table. There is a current component
-        at each point in time for the directory, which is either explicitly created
-        through start_component, or implicitly when files are added for the first
-        time. Files are added into the current component, and into the cab file.
-        To create a directory, a base directory object needs to be specified (can be
-        None), the path to the physical directory, and a logical directory name.
-        Default specifies the DefaultDir slot in the directory table. componentflags
-        specifies the default flags that new components get."""
+    ) -> None:
+        """Create a new directory in the Directory table. There is a current
+        component at each point in time for the directory, which is either
+        explicitly created through start_component, or implicitly when files
+        are added for the first time. Files are added into the current
+        component, and into the cab file. To create a directory, a base
+        directory object needs to be specified (can be None), the path to the
+        physical directory, and a logical directory name. Default specifies the
+        DefaultDir slot in the directory table. componentflags specifies the
+        default flags that new components get.
+        """
         index = 1
         _logical = make_id(_logical)
         logical = _logical
         while logical in _directories:
-            logical = "%s%d" % (_logical, index)
+            logical = f"{_logical}{index}"
             index += 1
         _directories.add(logical)
         self.db = db
@@ -307,23 +420,22 @@ class Directory:
 
     def start_component(
         self, component=None, feature=None, flags=None, keyfile=None, uuid=None
-    ):
-        """Add an entry to the Component table, and make this component the current for this
-        directory. If no component name is given, the directory name is used. If no feature
-        is given, the current feature is used. If no flags are given, the directory's default
-        flags are used. If no keyfile is given, the KeyPath is left null in the Component
-        table."""
+    ) -> None:
+        """Add an entry to the Component table, and make this component the
+        current for this directory. If no component name is given, the
+        directory name is used. If no feature is given, the current feature is
+        used. If no flags are given, the directory's default flags are used. If
+        no keyfile is given, the KeyPath is left null in the Component table.
+        """
         if flags is None:
             flags = self.componentflags
-        if uuid is None:
-            uuid = gen_uuid()
-        else:
-            uuid = uuid.upper()
+        uuid = gen_uuid() if uuid is None else uuid.upper()
         if component is None:
             component = self.logical
         self.component = component
-        if AMD64:
-            flags |= 256
+        # https://learn.microsoft.com/pt-br/windows/win32/msi/component-table
+        if AMD64 or ARM64:
+            flags |= 256  # msidbComponentAttributes64bit
         if keyfile:
             keyid = self.cab.gen_id(keyfile)
             self.keyfiles[keyfile] = keyid
@@ -338,10 +450,10 @@ class Directory:
             feature = current_feature
         add_data(self.db, "FeatureComponents", [(feature.id, component)])
 
-    def make_short(self, file):
+    def make_short(self, file: str) -> str:
         oldfile = file
         file = file.replace("+", "_")
-        file = "".join(c for c in file if not c in r' "/\[]:;=,')
+        file = "".join(c for c in file if c not in r' "/\[]:;=,')
         parts = file.split(".")
         if len(parts) > 1:
             prefix = "".join(parts[:-1]).upper()
@@ -358,10 +470,7 @@ class Directory:
             and file == oldfile
             and (not suffix or len(suffix) <= 3)
         ):
-            if suffix:
-                file = prefix + "." + suffix
-            else:
-                file = prefix
+            file = f"{prefix}.{suffix}" if suffix else prefix
         else:
             file = None
         if file is None or file in self.short_names:
@@ -371,9 +480,9 @@ class Directory:
             pos = 1
             while 1:
                 if suffix:
-                    file = "%s~%d.%s" % (prefix, pos, suffix)
+                    file = f"{prefix}~{pos}.{suffix}"
                 else:
-                    file = "%s~%d" % (prefix, pos)
+                    file = f"{prefix}~{pos}"
                 if file not in self.short_names:
                     break
                 pos += 1
@@ -381,17 +490,24 @@ class Directory:
                 if pos in (10, 100, 1000):
                     prefix = prefix[:-1]
         self.short_names.add(file)
-        assert not re.search(
-            r'[\?|><:/*"+,;=\[\]]', file
-        )  # restrictions on short names
+        # restrictions on short names
+        assert not re.search(r'[\?|><:/*"+,;=\[\]]', file)
         return file
 
-    def add_file(self, file, src=None, version=None, language=None):
-        """Add a file to the current component of the directory, starting a new one
-        if there is no current component. By default, the file name in the source
-        and the file table will be identical. If the src file is specified, it is
-        interpreted relative to the current directory. Optionally, a version and a
-        language can be specified for the entry in the File table."""
+    def add_file(
+        self,
+        file: str,
+        src: str | None = None,
+        version: str | None = None,
+        language: str | None = None,
+    ) -> str:
+        """Add a file to the current component of the directory, starting a new
+        one if there is no current component. By default, the file name in the
+        source and the file table will be identical. If the src file is
+        specified, it is interpreted relative to the current directory.
+        Optionally, a version and a language can be specified for the entry in
+        the File table.
+        """
         if not self.component:
             self.start_component(self.logical, current_feature, 0)
         if not src:
@@ -399,18 +515,14 @@ class Directory:
             src = file
             file = os.path.basename(file)
         absolute = os.path.join(self.absolute, src)
-        assert not re.search(
-            r'[\?|><:/*]"', file
-        )  # restrictions on long names
-        if file in self.keyfiles:
-            logical = self.keyfiles[file]
-        else:
-            logical = None
+        # restrictions on long names
+        assert not re.search(r'[\?|><:/*]"', file)
+        logical = self.keyfiles.get(file, None)
         sequence, logical = self.cab.append(absolute, file, logical)
         assert logical not in self.ids
         self.ids.add(logical)
         short = self.make_short(file)
-        full = "%s|%s" % (short, file)
+        full = f"{short}|{file}"
         filesize = os.stat(absolute).st_size
         # constants.msidbFileAttributesVital
         # Compressed omitted, since it is the database default
@@ -450,14 +562,14 @@ class Directory:
                     (
                         logical + "c",
                         self.component,
-                        "%sC|%sc" % (short, file),
+                        f"{short}C|{file}c",
                         self.logical,
                         2,
                     ),
                     (
                         logical + "o",
                         self.component,
-                        "%sO|%so" % (short, file),
+                        f"{short}O|{file}o",
                         self.logical,
                         2,
                     ),
@@ -465,9 +577,10 @@ class Directory:
             )
         return logical
 
-    def glob(self, pattern, exclude=None):
+    def glob(self, pattern: str, exclude=None) -> list[str]:
         """Add a list of files to the current component as specified in the
-        glob pattern. Individual files can be excluded in the exclude list."""
+        glob pattern. Individual files can be excluded in the exclude list.
+        """
         try:
             files = os.listdir(self.absolute)
         except OSError:
@@ -481,8 +594,8 @@ class Directory:
             self.add_file(f)
         return files
 
-    def remove_pyc(self):
-        "Remove .pyc files on uninstall"
+    def remove_pyc(self) -> None:
+        """Remove .pyc files on uninstall."""
         add_data(
             self.db,
             "RemoveFile",
@@ -491,11 +604,11 @@ class Directory:
 
 
 class Binary:
-    def __init__(self, fname):
+    def __init__(self, fname) -> None:
         self.name = fname
 
-    def __repr__(self):
-        return 'msilib.Binary(os.path.join(dirname,"%s"))' % self.name
+    def __repr__(self) -> str:
+        return f'msilib.Binary(os.path.join(dirname,"{self.name}"))'
 
 
 class Feature:
@@ -510,7 +623,7 @@ class Feature:
         parent=None,
         directory=None,
         attributes=0,
-    ):
+    ) -> None:
         self.id = id
         if parent:
             parent = parent.id
@@ -520,31 +633,31 @@ class Feature:
             [(id, parent, title, desc, display, level, directory, attributes)],
         )
 
-    def set_current(self):
+    def set_current(self) -> None:
         global current_feature
         current_feature = self
 
 
 class Control:
-    def __init__(self, dlg, name):
+    def __init__(self, dlg, name) -> None:
         self.dlg = dlg
         self.name = name
 
-    def event(self, event, argument, condition="1", ordering=None):
+    def event(self, event, argument, condition="1", ordering=None) -> None:
         add_data(
             self.dlg.db,
             "ControlEvent",
             [(self.dlg.name, self.name, event, argument, condition, ordering)],
         )
 
-    def mapping(self, event, attribute):
+    def mapping(self, event, attribute) -> None:
         add_data(
             self.dlg.db,
             "EventMapping",
             [(self.dlg.name, self.name, event, attribute)],
         )
 
-    def condition(self, action, condition):
+    def condition(self, action, condition) -> None:
         add_data(
             self.dlg.db,
             "ControlCondition",
@@ -553,13 +666,13 @@ class Control:
 
 
 class RadioButtonGroup(Control):
-    def __init__(self, dlg, name, property):
+    def __init__(self, dlg, name, property) -> None:
         self.dlg = dlg
         self.name = name
         self.property = property
         self.index = 1
 
-    def add(self, name, x, y, w, h, text, value=None):
+    def add(self, name, x, y, w, h, text, value=None) -> None:
         if value is None:
             value = name
         add_data(
@@ -573,7 +686,7 @@ class RadioButtonGroup(Control):
 class Dialog:
     def __init__(
         self, db, name, x, y, w, h, attr, title, first, default, cancel
-    ):
+    ) -> None:
         self.db = db
         self.name = name
         self.x, self.y, self.w, self.h = x, y, w, h
@@ -583,7 +696,9 @@ class Dialog:
             [(name, x, y, w, h, attr, title, first, default, cancel)],
         )
 
-    def control(self, name, type, x, y, w, h, attr, prop, text, next, help):
+    def control(
+        self, name, type, x, y, w, h, attr, prop, text, next, help
+    ) -> Control:
         add_data(
             self.db,
             "Control",
@@ -606,27 +721,27 @@ class Dialog:
         )
         return Control(self, name)
 
-    def text(self, name, x, y, w, h, attr, text):
+    def text(self, name, x, y, w, h, attr, text) -> Control:
         return self.control(
             name, "Text", x, y, w, h, attr, None, text, None, None
         )
 
-    def bitmap(self, name, x, y, w, h, text):
+    def bitmap(self, name, x, y, w, h, text) -> Control:
         return self.control(
             name, "Bitmap", x, y, w, h, 1, None, text, None, None
         )
 
-    def line(self, name, x, y, w, h):
+    def line(self, name, x, y, w, h) -> Control:
         return self.control(
             name, "Line", x, y, w, h, 1, None, None, None, None
         )
 
-    def pushbutton(self, name, x, y, w, h, attr, text, next):
+    def pushbutton(self, name, x, y, w, h, attr, text, next) -> Control:
         return self.control(
             name, "PushButton", x, y, w, h, attr, None, text, next, None
         )
 
-    def radiogroup(self, name, x, y, w, h, attr, prop, text, next):
+    def radiogroup(self, name, x, y, w, h, attr, prop, text, next) -> Control:
         add_data(
             self.db,
             "Control",
@@ -649,7 +764,7 @@ class Dialog:
         )
         return RadioButtonGroup(self, name, prop)
 
-    def checkbox(self, name, x, y, w, h, attr, prop, text, next):
+    def checkbox(self, name, x, y, w, h, attr, prop, text, next) -> Control:
         return self.control(
             name, "CheckBox", x, y, w, h, attr, prop, text, next, None
         )

msilib/_msi.c

@@ -565,18 +565,11 @@ static PyObject* _msi_Record_SetInteger_impl(
     Py_RETURN_NONE;
 }
 
-// clang-format off
-static PyMethodDef record_methods[] = {
-    _MSI_RECORD_GETFIELDCOUNT_METHODDEF
-    _MSI_RECORD_GETINTEGER_METHODDEF
-    _MSI_RECORD_GETSTRING_METHODDEF
-    _MSI_RECORD_SETSTRING_METHODDEF
-    _MSI_RECORD_SETSTREAM_METHODDEF
-    _MSI_RECORD_SETINTEGER_METHODDEF
-    _MSI_RECORD_CLEARDATA_METHODDEF
-    { NULL, NULL }
-};
-// clang-format on
+static PyMethodDef record_methods[]
+    = { _MSI_RECORD_GETFIELDCOUNT_METHODDEF, _MSI_RECORD_GETINTEGER_METHODDEF,
+          _MSI_RECORD_GETSTRING_METHODDEF, _MSI_RECORD_SETSTRING_METHODDEF,
+          _MSI_RECORD_SETSTREAM_METHODDEF, _MSI_RECORD_SETINTEGER_METHODDEF,
+          _MSI_RECORD_CLEARDATA_METHODDEF, _MSI_SENTINEL };
 
 static PyTypeObject record_Type = {
     PyVarObject_HEAD_INIT(NULL, 0) "_msi.Record", /*tp_name*/
@@ -777,15 +770,11 @@ static PyObject* _msi_SummaryInformation_Persist_impl(msiobj* self)
     Py_RETURN_NONE;
 }
 
-// clang-format off
-static PyMethodDef summary_methods[] = {
-    _MSI_SUMMARYINFORMATION_GETPROPERTY_METHODDEF
-    _MSI_SUMMARYINFORMATION_GETPROPERTYCOUNT_METHODDEF
-    _MSI_SUMMARYINFORMATION_SETPROPERTY_METHODDEF
-    _MSI_SUMMARYINFORMATION_PERSIST_METHODDEF
-    { NULL, NULL }
-};
-// clang-format on
+static PyMethodDef summary_methods[]
+    = { _MSI_SUMMARYINFORMATION_GETPROPERTY_METHODDEF,
+          _MSI_SUMMARYINFORMATION_GETPROPERTYCOUNT_METHODDEF,
+          _MSI_SUMMARYINFORMATION_SETPROPERTY_METHODDEF,
+          _MSI_SUMMARYINFORMATION_PERSIST_METHODDEF, _MSI_SENTINEL };
 
 static PyTypeObject summary_Type = {
     PyVarObject_HEAD_INIT(NULL, 0) "_msi.SummaryInformation", /*tp_name*/
@@ -953,16 +942,9 @@ static PyObject* _msi_View_Close_impl(msiobj* self)
     Py_RETURN_NONE;
 }
 
-// clang-format off
-static PyMethodDef view_methods[] = {
-    _MSI_VIEW_EXECUTE_METHODDEF
-    _MSI_VIEW_GETCOLUMNINFO_METHODDEF
-    _MSI_VIEW_FETCH_METHODDEF
-    _MSI_VIEW_MODIFY_METHODDEF
-    _MSI_VIEW_CLOSE_METHODDEF
-    { NULL, NULL }
-};
-// clang-format on
+static PyMethodDef view_methods[] = { _MSI_VIEW_EXECUTE_METHODDEF,
+    _MSI_VIEW_GETCOLUMNINFO_METHODDEF, _MSI_VIEW_FETCH_METHODDEF,
+    _MSI_VIEW_MODIFY_METHODDEF, _MSI_VIEW_CLOSE_METHODDEF, _MSI_SENTINEL };
 
 static PyTypeObject msiview_Type = {
     PyVarObject_HEAD_INIT(NULL, 0) "_msi.View", /*tp_name*/
@@ -1086,15 +1068,10 @@ static PyObject* _msi_Database_GetSummaryInformation_impl(
     return (PyObject*)oresult;
 }
 
-// clang-format off
-static PyMethodDef db_methods[] = {
-    _MSI_DATABASE_OPENVIEW_METHODDEF
-    _MSI_DATABASE_COMMIT_METHODDEF
-    _MSI_DATABASE_GETSUMMARYINFORMATION_METHODDEF
-    _MSI_DATABASE_CLOSE_METHODDEF
-    { NULL, NULL }
-};
-// clang-format on
+static PyMethodDef db_methods[]
+    = { _MSI_DATABASE_OPENVIEW_METHODDEF, _MSI_DATABASE_COMMIT_METHODDEF,
+          _MSI_DATABASE_GETSUMMARYINFORMATION_METHODDEF,
+          _MSI_DATABASE_CLOSE_METHODDEF, _MSI_SENTINEL };
 
 static PyTypeObject msidb_Type = {
     PyVarObject_HEAD_INIT(NULL, 0) "_msi.Database", /*tp_name*/
@@ -1207,15 +1184,9 @@ static PyObject* _msi_CreateRecord_impl(PyObject* module, int count)
     return record_new(h);
 }
 
-// clang-format off
-static PyMethodDef msi_methods[] = {
-        _MSI_UUIDCREATE_METHODDEF
-        _MSI_FCICREATE_METHODDEF
-        _MSI_OPENDATABASE_METHODDEF
-        _MSI_CREATERECORD_METHODDEF
-        {NULL,          NULL}           /* sentinel */
-};
-// clang-format on
+static PyMethodDef msi_methods[] = { _MSI_UUIDCREATE_METHODDEF,
+    _MSI_FCICREATE_METHODDEF, _MSI_OPENDATABASE_METHODDEF,
+    _MSI_CREATERECORD_METHODDEF, _MSI_SENTINEL };
 
 static char msi_doc[] = "Documentation";
 

msilib/include/_msi.h

@@ -6,6 +6,8 @@ preserve
 #define Py_BUILD_CORE
 #include <internal/pycore_modsupport.h>
 
+#define _MSI_SENTINEL { NULL, NULL }
+
 PyDoc_STRVAR(_msi_UuidCreate__doc__,
     "UuidCreate($module, /)\n"
     "--\n"
@@ -14,7 +16,7 @@ PyDoc_STRVAR(_msi_UuidCreate__doc__,
 
 #define _MSI_UUIDCREATE_METHODDEF                                             \
     { "UuidCreate", (PyCFunction)_msi_UuidCreate, METH_NOARGS,                \
-        _msi_UuidCreate__doc__ },
+        _msi_UuidCreate__doc__ }
 
 static PyObject* _msi_UuidCreate_impl(PyObject* module);
 
@@ -38,7 +40,7 @@ PyDoc_STRVAR(_msi_FCICreate__doc__,
 
 #define _MSI_FCICREATE_METHODDEF                                              \
     { "FCICreate", _PyCFunction_CAST(_msi_FCICreate), METH_FASTCALL,          \
-        _msi_FCICreate__doc__ },
+        _msi_FCICreate__doc__ }
 
 static PyObject* _msi_FCICreate_impl(
     PyObject* module, const char* cabname, PyObject* files);
@@ -81,7 +83,7 @@ PyDoc_STRVAR(_msi_Database_Close__doc__,
 
 #define _MSI_DATABASE_CLOSE_METHODDEF                                         \
     { "Close", (PyCFunction)_msi_Database_Close, METH_NOARGS,                 \
-        _msi_Database_Close__doc__ },
+        _msi_Database_Close__doc__ }
 
 static PyObject* _msi_Database_Close_impl(msiobj* self);
 
@@ -99,7 +101,7 @@ PyDoc_STRVAR(_msi_Record_GetFieldCount__doc__,
 
 #define _MSI_RECORD_GETFIELDCOUNT_METHODDEF                                   \
     { "GetFieldCount", (PyCFunction)_msi_Record_GetFieldCount, METH_NOARGS,   \
-        _msi_Record_GetFieldCount__doc__ },
+        _msi_Record_GetFieldCount__doc__ }
 
 static PyObject* _msi_Record_GetFieldCount_impl(msiobj* self);
 
@@ -117,7 +119,7 @@ PyDoc_STRVAR(_msi_Record_GetInteger__doc__,
 
 #define _MSI_RECORD_GETINTEGER_METHODDEF                                      \
     { "GetInteger", (PyCFunction)_msi_Record_GetInteger, METH_O,              \
-        _msi_Record_GetInteger__doc__ },
+        _msi_Record_GetInteger__doc__ }
 
 static PyObject* _msi_Record_GetInteger_impl(msiobj* self, unsigned int field);
 
@@ -144,7 +146,7 @@ PyDoc_STRVAR(_msi_Record_GetString__doc__,
 
 #define _MSI_RECORD_GETSTRING_METHODDEF                                       \
     { "GetString", (PyCFunction)_msi_Record_GetString, METH_O,                \
-        _msi_Record_GetString__doc__ },
+        _msi_Record_GetString__doc__ }
 
 static PyObject* _msi_Record_GetString_impl(msiobj* self, unsigned int field);
 
@@ -171,7 +173,7 @@ PyDoc_STRVAR(_msi_Record_ClearData__doc__,
 
 #define _MSI_RECORD_CLEARDATA_METHODDEF                                       \
     { "ClearData", (PyCFunction)_msi_Record_ClearData, METH_NOARGS,           \
-        _msi_Record_ClearData__doc__ },
+        _msi_Record_ClearData__doc__ }
 
 static PyObject* _msi_Record_ClearData_impl(msiobj* self);
 
@@ -189,7 +191,7 @@ PyDoc_STRVAR(_msi_Record_SetString__doc__,
 
 #define _MSI_RECORD_SETSTRING_METHODDEF                                       \
     { "SetString", _PyCFunction_CAST(_msi_Record_SetString), METH_FASTCALL,   \
-        _msi_Record_SetString__doc__ },
+        _msi_Record_SetString__doc__ }
 
 static PyObject* _msi_Record_SetString_impl(
     msiobj* self, int field, const wchar_t* value);
@@ -233,7 +235,7 @@ PyDoc_STRVAR(_msi_Record_SetStream__doc__,
 
 #define _MSI_RECORD_SETSTREAM_METHODDEF                                       \
     { "SetStream", _PyCFunction_CAST(_msi_Record_SetStream), METH_FASTCALL,   \
-        _msi_Record_SetStream__doc__ },
+        _msi_Record_SetStream__doc__ }
 
 static PyObject* _msi_Record_SetStream_impl(
     msiobj* self, int field, const wchar_t* value);
@@ -277,7 +279,7 @@ PyDoc_STRVAR(_msi_Record_SetInteger__doc__,
 
 #define _MSI_RECORD_SETINTEGER_METHODDEF                                      \
     { "SetInteger", _PyCFunction_CAST(_msi_Record_SetInteger), METH_FASTCALL, \
-        _msi_Record_SetInteger__doc__ },
+        _msi_Record_SetInteger__doc__ }
 
 static PyObject* _msi_Record_SetInteger_impl(
     msiobj* self, int field, int value);
@@ -317,7 +319,7 @@ PyDoc_STRVAR(_msi_SummaryInformation_GetProperty__doc__,
 
 #define _MSI_SUMMARYINFORMATION_GETPROPERTY_METHODDEF                         \
     { "GetProperty", (PyCFunction)_msi_SummaryInformation_GetProperty,        \
-        METH_O, _msi_SummaryInformation_GetProperty__doc__ },
+        METH_O, _msi_SummaryInformation_GetProperty__doc__ }
 
 static PyObject* _msi_SummaryInformation_GetProperty_impl(
     msiobj* self, int field);
@@ -347,7 +349,7 @@ PyDoc_STRVAR(_msi_SummaryInformation_GetPropertyCount__doc__,
 #define _MSI_SUMMARYINFORMATION_GETPROPERTYCOUNT_METHODDEF                    \
     { "GetPropertyCount",                                                     \
         (PyCFunction)_msi_SummaryInformation_GetPropertyCount, METH_NOARGS,   \
-        _msi_SummaryInformation_GetPropertyCount__doc__ },
+        _msi_SummaryInformation_GetPropertyCount__doc__ }
 
 static PyObject* _msi_SummaryInformation_GetPropertyCount_impl(msiobj* self);
 
@@ -370,7 +372,7 @@ PyDoc_STRVAR(_msi_SummaryInformation_SetProperty__doc__,
 
 #define _MSI_SUMMARYINFORMATION_SETPROPERTY_METHODDEF                         \
     { "SetProperty", _PyCFunction_CAST(_msi_SummaryInformation_SetProperty),  \
-        METH_FASTCALL, _msi_SummaryInformation_SetProperty__doc__ },
+        METH_FASTCALL, _msi_SummaryInformation_SetProperty__doc__ }
 
 static PyObject* _msi_SummaryInformation_SetProperty_impl(
     msiobj* self, int field, PyObject* data);
@@ -404,7 +406,7 @@ PyDoc_STRVAR(_msi_SummaryInformation_Persist__doc__,
 
 #define _MSI_SUMMARYINFORMATION_PERSIST_METHODDEF                             \
     { "Persist", (PyCFunction)_msi_SummaryInformation_Persist, METH_NOARGS,   \
-        _msi_SummaryInformation_Persist__doc__ },
+        _msi_SummaryInformation_Persist__doc__ }
 
 static PyObject* _msi_SummaryInformation_Persist_impl(msiobj* self);
 
@@ -426,7 +428,7 @@ PyDoc_STRVAR(_msi_View_Execute__doc__,
 
 #define _MSI_VIEW_EXECUTE_METHODDEF                                           \
     { "Execute", (PyCFunction)_msi_View_Execute, METH_O,                      \
-        _msi_View_Execute__doc__ },
+        _msi_View_Execute__doc__ }
 
 PyDoc_STRVAR(_msi_View_Fetch__doc__,
     "Fetch($self, /)\n"
@@ -436,7 +438,7 @@ PyDoc_STRVAR(_msi_View_Fetch__doc__,
 
 #define _MSI_VIEW_FETCH_METHODDEF                                             \
     { "Fetch", (PyCFunction)_msi_View_Fetch, METH_NOARGS,                     \
-        _msi_View_Fetch__doc__ },
+        _msi_View_Fetch__doc__ }
 
 static PyObject* _msi_View_Fetch_impl(msiobj* self);
 
@@ -456,7 +458,7 @@ PyDoc_STRVAR(_msi_View_GetColumnInfo__doc__,
 
 #define _MSI_VIEW_GETCOLUMNINFO_METHODDEF                                     \
     { "GetColumnInfo", (PyCFunction)_msi_View_GetColumnInfo, METH_O,          \
-        _msi_View_GetColumnInfo__doc__ },
+        _msi_View_GetColumnInfo__doc__ }
 
 static PyObject* _msi_View_GetColumnInfo_impl(msiobj* self, int kind);
 
@@ -488,7 +490,7 @@ PyDoc_STRVAR(_msi_View_Modify__doc__,
 
 #define _MSI_VIEW_MODIFY_METHODDEF                                            \
     { "Modify", _PyCFunction_CAST(_msi_View_Modify), METH_FASTCALL,           \
-        _msi_View_Modify__doc__ },
+        _msi_View_Modify__doc__ }
 
 static PyObject* _msi_View_Modify_impl(msiobj* self, int kind, PyObject* data);
 
@@ -521,7 +523,7 @@ PyDoc_STRVAR(_msi_View_Close__doc__,
 
 #define _MSI_VIEW_CLOSE_METHODDEF                                             \
     { "Close", (PyCFunction)_msi_View_Close, METH_NOARGS,                     \
-        _msi_View_Close__doc__ },
+        _msi_View_Close__doc__ }
 
 static PyObject* _msi_View_Close_impl(msiobj* self);
 
@@ -541,7 +543,7 @@ PyDoc_STRVAR(_msi_Database_OpenView__doc__,
 
 #define _MSI_DATABASE_OPENVIEW_METHODDEF                                      \
     { "OpenView", (PyCFunction)_msi_Database_OpenView, METH_O,                \
-        _msi_Database_OpenView__doc__ },
+        _msi_Database_OpenView__doc__ }
 
 static PyObject* _msi_Database_OpenView_impl(msiobj* self, const wchar_t* sql);
 
@@ -575,7 +577,7 @@ PyDoc_STRVAR(_msi_Database_Commit__doc__,
 
 #define _MSI_DATABASE_COMMIT_METHODDEF                                        \
     { "Commit", (PyCFunction)_msi_Database_Commit, METH_NOARGS,               \
-        _msi_Database_Commit__doc__ },
+        _msi_Database_Commit__doc__ }
 
 static PyObject* _msi_Database_Commit_impl(msiobj* self);
 
@@ -597,7 +599,7 @@ PyDoc_STRVAR(_msi_Database_GetSummaryInformation__doc__,
 #define _MSI_DATABASE_GETSUMMARYINFORMATION_METHODDEF                         \
     { "GetSummaryInformation",                                                \
         (PyCFunction)_msi_Database_GetSummaryInformation, METH_O,             \
-        _msi_Database_GetSummaryInformation__doc__ },
+        _msi_Database_GetSummaryInformation__doc__ }
 
 static PyObject* _msi_Database_GetSummaryInformation_impl(
     msiobj* self, int count);
@@ -631,7 +633,7 @@ PyDoc_STRVAR(_msi_OpenDatabase__doc__,
 
 #define _MSI_OPENDATABASE_METHODDEF                                           \
     { "OpenDatabase", _PyCFunction_CAST(_msi_OpenDatabase), METH_FASTCALL,    \
-        _msi_OpenDatabase__doc__ },
+        _msi_OpenDatabase__doc__ }
 
 static PyObject* _msi_OpenDatabase_impl(
     PyObject* module, const wchar_t* path, int persist);
@@ -678,7 +680,7 @@ PyDoc_STRVAR(_msi_CreateRecord__doc__,
 
 #define _MSI_CREATERECORD_METHODDEF                                           \
     { "CreateRecord", (PyCFunction)_msi_CreateRecord, METH_O,                 \
-        _msi_CreateRecord__doc__ },
+        _msi_CreateRecord__doc__ }
 
 static PyObject* _msi_CreateRecord_impl(PyObject* module, int count);
 

msilib/schema.py

@@ -1,3 +1,8 @@
+"""The standard MSI schema for MSI 2.0, with the tables variable providing a
+list of table definitions, and _Validation_records providing the data for MSI
+validation.
+"""
+
 from . import Table
 
 _Validation = Table("_Validation")

msilib/sequence.py

@@ -1,3 +1,8 @@
+"""Table contents for the standard sequence tables:
+AdminExecuteSequence, AdminUISequence, AdvtExecuteSequence,
+InstallExecuteSequence, and InstallUISequence.
+"""
+
 AdminExecuteSequence = [
     ("InstallInitialize", None, 1500),
     ("InstallFinalize", None, 6600),

msilib/text.py

@@ -1,4 +1,8 @@
-import msilib, os
+"""Definitions for the UIText and ActionText tables, for the standard installer
+actions.
+"""
+
+import os
 
 dirname = os.path.dirname(__file__)
 

{python_msilib-0.3.0.dist-info → python_msilib-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-msilib
-Version: 0.3.0
+Version: 0.4.0
 Summary: Read and write Microsoft Installer files
 Author-email: Marcelo Duarte <marcelotduarte@users.noreply.github.com>
 License-Expression: PSF-2.0

python_msilib-0.4.0.dist-info/RECORD

@@ -0,0 +1,13 @@
+msilib/__init__.py,sha256=IQGo-bdp711AtRjjgpiIZK9sH2kuRTBcMezHYDm-1zc,23156
+msilib/_msi.c,sha256=xPgxiCH___904SmeJf6SxZ4m7Q1chSi9JlKsSx592ko,38426
+msilib/_msi.cp313-win_arm64.pyd,sha256=euext9xk6NrmuI4JcDQckO5hixUuKq4MuKfDtohYKyA,33792
+msilib/schema.py,sha256=USaXE5O_3pkt8VLbJcSIjhTtvOgprJgjoRn9wMvIJv4,128781
+msilib/sequence.py,sha256=MF0rHrOQ1WX-cQ9oFRV55Snk6Fa9wJqgSOSNIpErDME,4695
+msilib/text.py,sha256=XbcropSwKsrL5WoNTiW-Lbmj9CGY3r4op4ENHfPki94,11129
+msilib/include/_msi.h,sha256=hDS-3E6dRHj8f6sg3FArpD1CHM9m8kGfH5gDYD8eang,20945
+msilib/include/pythoncapi_compat.h,sha256=ntwNXFRDLa7FFJ1dVrlBRK0S_ms8aKD7t1XXoN6u4Bo,73222
+python_msilib-0.4.0.dist-info/licenses/LICENSE,sha256=Wju9Q0A41nBaSfjgklLmLoONJJJSYQD8agr81R5HUnI,2584
+python_msilib-0.4.0.dist-info/METADATA,sha256=R_e3MBULhS86v1vLewMtdMN17AB2k49BzK2C5Fj9xnk,3652
+python_msilib-0.4.0.dist-info/WHEEL,sha256=QL7uMKXoDJRpSwAf1VOVpjVXYPYll2YWTJ-omqdO8-4,101
+python_msilib-0.4.0.dist-info/top_level.txt,sha256=reGDwqhWKgUpH6z4VDR3W4MUnrUixkQv8pFZxMzH4Es,7
+python_msilib-0.4.0.dist-info/RECORD,,

python_msilib-0.3.0.dist-info/RECORD

@@ -1,13 +0,0 @@
-msilib/__init__.py,sha256=tfVCYTeiYkKCJbvx92ETwc3Zi9EiX5Fp1K-cdcHe8pw,20135
-msilib/_msi.c,sha256=cP6TFig0RdogyKNHzlIcVgRO6qv28Fe__Ydng6V39Gg,38691
-msilib/_msi.cp313-win_arm64.pyd,sha256=soWny1WjL4IUYOXHDB0U0JXWH-1GzjidnHSMLpQR1aQ,33792
-msilib/schema.py,sha256=_qBk8geNrA5Iup92yLvv8rgbx4EUSyA0BoPxqT6Q95U,128604
-msilib/sequence.py,sha256=m1Yo_u1JGuGpHydHVNJFHvvXMZ3wBU-yHWq9px6ed1I,4526
-msilib/text.py,sha256=Xd4CFDmgChKgIf6qsc6IFzT4YmJYXH8TqPm1W6GOW10,11039
-msilib/include/_msi.h,sha256=sPtYIxAB6HS6K3_MWHpcd639whVvTqt78Pumt77l_gI,20929
-msilib/include/pythoncapi_compat.h,sha256=ntwNXFRDLa7FFJ1dVrlBRK0S_ms8aKD7t1XXoN6u4Bo,73222
-python_msilib-0.3.0.dist-info/licenses/LICENSE,sha256=Wju9Q0A41nBaSfjgklLmLoONJJJSYQD8agr81R5HUnI,2584
-python_msilib-0.3.0.dist-info/METADATA,sha256=xfVSfTXvFp-ey3k2kyySW2iTy5sRch7f4PCBtj-WIhk,3652
-python_msilib-0.3.0.dist-info/WHEEL,sha256=QL7uMKXoDJRpSwAf1VOVpjVXYPYll2YWTJ-omqdO8-4,101
-python_msilib-0.3.0.dist-info/top_level.txt,sha256=reGDwqhWKgUpH6z4VDR3W4MUnrUixkQv8pFZxMzH4Es,7
-python_msilib-0.3.0.dist-info/RECORD,,