[Python-checkins] r71293 - in python/branches/py3k: Doc/distutils/builtdist.rst Lib/distutils/command/bdist.py Lib/distutils/tests/test_bdist.py Misc/NEWS

Mon Apr 6 00:57:22 CEST 2009

Author: tarek.ziade
Date: Mon Apr 6 00:57:21 2009
New Revision: 71293
Log:
Merged revisions 71291 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r71291 | tarek.ziade | 2009年04月06日 00:51:09 +0200 (2009年4月06日) | 1 line
 
 Fixed #5095: msi missing from Distutils bdist formats
........
Added:
 python/branches/py3k/Lib/distutils/tests/test_bdist.py
 - copied, changed from r71291, /python/trunk/Lib/distutils/tests/test_bdist.py
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Doc/distutils/builtdist.rst
 python/branches/py3k/Lib/distutils/command/bdist.py
 python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Doc/distutils/builtdist.rst
==============================================================================

--- python/branches/py3k/Doc/distutils/builtdist.rst	(original)
+++ python/branches/py3k/Doc/distutils/builtdist.rst	Mon Apr 6 00:57:21 2009
@@ -80,7 +80,7 @@
 +-------------+------------------------------+---------+
 | ``tar`` | tar file (:file:`.tar`) | \(3) |
 +-------------+------------------------------+---------+
-| ``zip`` | zip file (:file:`.zip`) | \(4) |
+| ``zip`` | zip file (:file:`.zip`) | (2),(4) |
 +-------------+------------------------------+---------+
 | ``rpm`` | RPM | \(5) |
 +-------------+------------------------------+---------+
@@ -90,9 +90,12 @@
 +-------------+------------------------------+---------+
 | ``rpm`` | RPM | \(5) |
 +-------------+------------------------------+---------+
-| ``wininst`` | self-extracting ZIP file for | (2),(4) |
+| ``wininst`` | self-extracting ZIP file for | \(4) |
 | | Windows | |
 +-------------+------------------------------+---------+
+| ``msi`` | Microsoft Installer. | |
++-------------+------------------------------+---------+
+
 
 Notes:
 
@@ -102,8 +105,6 @@
 (2)
 default on Windows
 
- **\*\*** to-do! **\*\***
-
 (3)
 requires external utilities: :program:`tar` and possibly one of :program:`gzip`,
 :program:`bzip2`, or :program:`compress`
@@ -133,6 +134,8 @@
 +--------------------------+-----------------------+
 | :command:`bdist_wininst` | wininst |
 +--------------------------+-----------------------+
+| :command:`bdist_msi` | msi |
++--------------------------+-----------------------+
 
 The following sections give details on the individual :command:`bdist_\*`
 commands.
Modified: python/branches/py3k/Lib/distutils/command/bdist.py
==============================================================================
--- python/branches/py3k/Lib/distutils/command/bdist.py	(original)
+++ python/branches/py3k/Lib/distutils/command/bdist.py	Mon Apr 6 00:57:21 2009
@@ -49,35 +49,28 @@
 ]
 
 # The following commands do not take a format option from bdist
- no_format_option = ('bdist_rpm',
- #'bdist_sdux', 'bdist_pkgtool'
- )
+ no_format_option = ('bdist_rpm',)
 
 # This won't do in reality: will need to distinguish RPM-ish Linux,
 # Debian-ish Linux, Solaris, FreeBSD, ..., Windows, Mac OS.
- default_format = { 'posix': 'gztar',
- 'nt': 'zip',
- 'os2': 'zip', }
+ default_format = {'posix': 'gztar',
+ 'nt': 'zip',
+ 'os2': 'zip'}
 
 # Establish the preferred order (for the --help-formats option).
 format_commands = ['rpm', 'gztar', 'bztar', 'ztar', 'tar',
- 'wininst', 'zip',
- #'pkgtool', 'sdux'
- ]
+ 'wininst', 'zip', 'msi']
 
 # And the real information.
- format_command = { 'rpm': ('bdist_rpm', "RPM distribution"),
- 'zip': ('bdist_dumb', "ZIP file"),
- 'gztar': ('bdist_dumb', "gzip'ed tar file"),
- 'bztar': ('bdist_dumb', "bzip2'ed tar file"),
- 'ztar': ('bdist_dumb', "compressed tar file"),
- 'tar': ('bdist_dumb', "tar file"),
- 'wininst': ('bdist_wininst',
- "Windows executable installer"),
- 'zip': ('bdist_dumb', "ZIP file"),
- #'pkgtool': ('bdist_pkgtool',
- # "Solaris pkgtool distribution"),
- #'sdux': ('bdist_sdux', "HP-UX swinstall depot"),
+ format_command = {'rpm': ('bdist_rpm', "RPM distribution"),
+ 'gztar': ('bdist_dumb', "gzip'ed tar file"),
+ 'bztar': ('bdist_dumb', "bzip2'ed tar file"),
+ 'ztar': ('bdist_dumb', "compressed tar file"),
+ 'tar': ('bdist_dumb', "tar file"),
+ 'wininst': ('bdist_wininst',
+ "Windows executable installer"),
+ 'zip': ('bdist_dumb', "ZIP file"),
+ 'msi': ('bdist_msi', "Microsoft Installer")
 }
 
 
Copied: python/branches/py3k/Lib/distutils/tests/test_bdist.py (from r71291, /python/trunk/Lib/distutils/tests/test_bdist.py)
==============================================================================
--- /python/trunk/Lib/distutils/tests/test_bdist.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_bdist.py	Mon Apr 6 00:57:21 2009
@@ -32,7 +32,7 @@
 formats = ['rpm', 'zip', 'gztar', 'bztar', 'ztar',
 'tar', 'wininst', 'msi']
 formats.sort()
- founded = cmd.format_command.keys()
+ founded = list(cmd.format_command.keys())
 founded.sort()
 self.assertEquals(founded, formats)
 
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Mon Apr 6 00:57:21 2009
@@ -327,6 +327,9 @@
 Library
 -------
 
+- Issue #5095: Added bdist_msi to the list of bdist supported formats.
+ Initial fix by Steven Bethard.
+
 - Issue #1491431: Fixed distutils.filelist.glob_to_re for edge cases.
 Initial fix by Wayne Davison.
 
