From a420c820fe243cbc0d729e9c60f8a93810e973a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Araujo?= Date: Wed, 7 Mar 2012 20:48:55 +0100 Subject: Backout buggy patch committed for #13719 --- Lib/distutils/command/bdist_msi.py | 2 +- Lib/distutils/tests/test_bdist_msi.py | 9 --------- Misc/NEWS | 2 -- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/Lib/distutils/command/bdist_msi.py b/Lib/distutils/command/bdist_msi.py index fde0f63..b3cfe9c 100644 --- a/Lib/distutils/command/bdist_msi.py +++ b/Lib/distutils/command/bdist_msi.py @@ -260,7 +260,7 @@ class bdist_msi(Command): 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 index e599461..15d8bdf 100644 --- 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 @@ class BDistMSITestCase(support.TempdirManager, 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 index 250dd81..cd0024e 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -130,8 +130,6 @@ Core and Builtins 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. -- cgit v0.12