[Python-checkins] r51964 - in sandbox/branches/setuptools-0.6: setuptools.txt setuptools/command/__init__.py setuptools/command/bdist_wininst.py

[phillip.eby]

Author: phillip.eby
Date: Fri Sep 22 00:15:28 2006
New Revision: 51964

Added:
   sandbox/branches/setuptools-0.6/setuptools/command/bdist_wininst.py
      - copied unchanged from r51963, sandbox/trunk/setuptools/setuptools/command/bdist_wininst.py
Modified:
   sandbox/branches/setuptools-0.6/setuptools.txt
   sandbox/branches/setuptools-0.6/setuptools/command/__init__.py
Log:
Fix bdist_wininst files not being uploaded by "upload"
(backport from trunk)


Modified: sandbox/branches/setuptools-0.6/setuptools.txt
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools.txt	(original)
+++ sandbox/branches/setuptools-0.6/setuptools.txt	Fri Sep 22 00:15:28 2006
@@ -2564,8 +2564,8 @@
 ----------------------------
 
 0.6c4
- * Fix ``upload`` not uploading files built by ``bdist_rpm`` on Python 2.3 and
-   2.4.
+ * Fix ``upload`` command not uploading files built by ``bdist_rpm`` or
+   ``bdist_wininst`` under Python 2.3 and 2.4.
 
 0.6c3
  * Fixed breakages caused by Subversion 1.4's new "working copy" format

Modified: sandbox/branches/setuptools-0.6/setuptools/command/__init__.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/command/__init__.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/command/__init__.py	Fri Sep 22 00:15:28 2006
@@ -2,13 +2,14 @@
     'alias', 'bdist_egg', 'bdist_rpm', 'build_ext', 'build_py', 'develop',
     'easy_install', 'egg_info', 'install', 'install_lib', 'rotate', 'saveopts',
     'sdist', 'setopt', 'test', 'upload', 'install_egg_info', 'install_scripts',
-    'register',
+    'register', 'bdist_wininst',
 ]
 
 import sys
 if sys.version>='2.5':
     # In Python 2.5 and above, distutils includes its own upload command
     __all__.remove('upload')
+    __all__.remove('bdist_wininst')  # this is only for 'upload' support
 
 from distutils.command.bdist import bdist