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

[eric.araujo]

http://hg.python.org/cpython/rev/e52a31b83062
changeset:   75474:e52a31b83062
parent:      75471:e4c3a3a6371f
parent:      75473:7e629bacec87
user:        Éric Araujo <merwok at netwok.org>
date:        Wed Mar 07 20:50:06 2012 +0100
summary:
  Merge 3.2

files:
  Lib/distutils/command/bdist_msi.py    |  2 +-
  Lib/distutils/tests/test_bdist_msi.py |  9 ---------
  2 files changed, 1 insertions(+), 10 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():

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