Skip to content

Commit eb254b4

Browse files
authored
bpo-45124: Remove the bdist_msi command (GH-28195)
The bdist_msi command, deprecated in Python 3.9, is now removed. Use bdist_wheel (wheel packages) instead.
1 parent 533e725 commit eb254b4

File tree

11 files changed

+18
-822
lines changed

11 files changed

+18
-822
lines changed

Doc/distutils/apiref.rst

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1852,22 +1852,6 @@ Subclasses of :class:`Command` must define the following methods.
18521852
.. % todo
18531853
18541854
1855-
:mod:`distutils.command.bdist_msi` --- Build a Microsoft Installer binary package
1856-
=================================================================================
1857-
1858-
.. module:: distutils.command.bdist_msi
1859-
:synopsis: Build a binary distribution as a Windows MSI file
1860-
1861-
.. class:: bdist_msi
1862-
1863-
.. deprecated:: 3.9
1864-
Use bdist_wheel (wheel packages) instead.
1865-
1866-
Builds a `Windows Installer`_ (.msi) binary package.
1867-
1868-
.. _Windows Installer: https://msdn.microsoft.com/en-us/library/cc185688(VS.85).aspx
1869-
1870-
18711855
:mod:`distutils.command.bdist_rpm` --- Build a binary distribution as a Redhat RPM and SRPM
18721856
===========================================================================================
18731857

Doc/distutils/builtdist.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,6 @@ generated by each, are:
138138
+--------------------------+-------------------------------------+
139139
| :command:`bdist_rpm` | rpm, srpm |
140140
+--------------------------+-------------------------------------+
141-
| :command:`bdist_msi` | msi |
142-
+--------------------------+-------------------------------------+
143-
144-
.. note::
145-
bdist_msi is deprecated since Python 3.9.
146141

147142
The following sections give details on the individual :command:`bdist_\*`
148143
commands.

Doc/library/msilib.rst

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@ exposes an API to create CAB files. Support for reading ``.cab`` files is
2020
currently not implemented; read support for the ``.msi`` database is possible.
2121

2222
This package aims to provide complete access to all tables in an ``.msi`` file,
23-
therefore, it is a fairly low-level API. Two primary applications of this
24-
package are the :mod:`distutils` command ``bdist_msi``, and the creation of
25-
Python installer package itself (although that currently uses a different
26-
version of ``msilib``).
23+
therefore, it is a fairly low-level API. One primary application of this
24+
package is the creation of Python installer package itself (although that currently
25+
uses a different version of ``msilib``).
2726

2827
The package contents can be roughly split into four parts: low-level CAB
2928
routines, low-level MSI routines, higher-level MSI routines, and standard table
@@ -439,9 +438,7 @@ GUI classes
439438
-----------
440439

441440
:mod:`msilib` provides several classes that wrap the GUI tables in an MSI
442-
database. However, no standard user interface is provided; use
443-
:mod:`~distutils.command.bdist_msi` to create MSI files with a user-interface
444-
for installing Python packages.
441+
database. However, no standard user interface is provided.
445442

446443

447444
.. class:: Control(dlg, name)

Doc/whatsnew/3.11.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,9 @@ Removed
250250

251251
(Contributed by Victor Stinner in :issue:`45085`.)
252252

253+
* The distutils ``bdist_msi`` command, deprecated in Python 3.9, is now removed.
254+
Use ``bdist_wheel`` (wheel packages) instead.
255+
(Contributed by Hugo van Kemenade in :issue:`45124`.)
253256

254257
Optimizations
255258
=============

Lib/distutils/command/bdist.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ class bdist(Command):
6161
'nt': 'zip'}
6262

6363
# Establish the preferred order (for the --help-formats option).
64-
format_commands = ['rpm', 'gztar', 'bztar', 'xztar', 'ztar', 'tar',
65-
'zip', 'msi']
64+
format_commands = ['rpm', 'gztar', 'bztar', 'xztar', 'ztar', 'tar', 'zip']
6665

6766
# And the real information.
6867
format_command = {'rpm': ('bdist_rpm', "RPM distribution"),
@@ -72,10 +71,8 @@ class bdist(Command):
7271
'ztar': ('bdist_dumb', "compressed tar file"),
7372
'tar': ('bdist_dumb', "tar file"),
7473
'zip': ('bdist_dumb', "ZIP file"),
75-
'msi': ('bdist_msi', "Microsoft Installer")
7674
}
7775

78-
7976
def initialize_options(self):
8077
self.bdist_base = None
8178
self.plat_name = None

0 commit comments

Comments
 (0)