[Python-checkins] cpython (merge 3.2 -> 3.2): merge heads

[benjamin.peterson]

http://hg.python.org/cpython/rev/95bbe3229cd0
changeset:   75477:95bbe3229cd0
branch:      3.2
parent:      75476:10a79a33d09b
parent:      75473:7e629bacec87
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Mar 07 14:50:35 2012 -0600
summary:
  merge heads

files:
  Lib/distutils/command/bdist_msi.py    |  2 +-
  Lib/distutils/tests/test_bdist_msi.py |  9 ---------
  Misc/NEWS                             |  2 --
  3 files changed, 1 insertions(+), 12 deletions(-)


diff --git a/Lib/distutils/command/bdist_msi.py b/Lib/distutils/command/bdist_msi.py
--- a/Lib/distutils/command/bdist_msi.py
+++ b/Lib/distutils/command/bdist_msi.py
@@ -260,7 +260,7 @@
         self.db.Commit()
 
         if hasattr(self.distribution, 'dist_files'):
-            tup = 'bdist_msi', self.target_version or 'any', installer_name
+            tup = 'bdist_msi', self.target_version or 'any', fullname
             self.distribution.dist_files.append(tup)
 
         if not self.keep_temp:
diff --git a/Lib/distutils/tests/test_bdist_msi.py b/Lib/distutils/tests/test_bdist_msi.py
--- a/Lib/distutils/tests/test_bdist_msi.py
+++ b/Lib/distutils/tests/test_bdist_msi.py
@@ -1,5 +1,4 @@
 """Tests for distutils.command.bdist_msi."""
-import os
 import sys
 import unittest
 from test.support import run_unittest
@@ -17,14 +16,6 @@
         project_dir, dist = self.create_dist()
         cmd = bdist_msi(dist)
         cmd.ensure_finalized()
-        cmd.run()
-
-        bdists = os.listdir(os.path.join(project_dir, 'dist'))
-        self.assertEqual(bdists, ['foo-0.1.msi'])
-
-        # bug #13719: upload ignores bdist_msi files
-        self.assertEqual(dist.dist_files,
-                         [('bdist_msi', 'any', 'dist/foo-0.1.msi')])
 
 
 def test_suite():
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -130,8 +130,6 @@
 Library
 -------
 
-- Issue #13719: Make the distutils upload command aware of bdist_msi products.
-
 - Issue #14195: An issue that caused weakref.WeakSet instances to incorrectly
   return True for a WeakSet instance 'a' in both 'a < a' and 'a > a' has been
   fixed.

-- 
Repository URL: http://hg.python.org/cpython