(original) (raw)

changeset: 75472:077b42a54803 branch: 2.7 parent: 75466:1e3c18c923ca user: Éric Araujo merwok@netwok.org date: Wed Mar 07 21:00:44 2012 +0100 files: Lib/distutils/command/bdist_msi.py Lib/distutils/tests/test_bdist_msi.py Misc/NEWS description: Backout buggy patch for #13719 diff -r 1e3c18c923ca -r 077b42a54803 Lib/distutils/command/bdist_msi.py --- a/Lib/distutils/command/bdist_msi.py Wed Mar 07 10:24:04 2012 -0500 +++ b/Lib/distutils/command/bdist_msi.py Wed Mar 07 21:00:44 2012 +0100 @@ -262,7 +262,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 -r 1e3c18c923ca -r 077b42a54803 Lib/distutils/tests/test_bdist_msi.py --- a/Lib/distutils/tests/test_bdist_msi.py Wed Mar 07 10:24:04 2012 -0500 +++ b/Lib/distutils/tests/test_bdist_msi.py Wed Mar 07 21:00:44 2012 +0100 @@ -1,5 +1,4 @@ """Tests for distutils.command.bdist_msi.""" -import os import sys import unittest from test.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 -r 1e3c18c923ca -r 077b42a54803 Misc/NEWS --- a/Misc/NEWS Wed Mar 07 10:24:04 2012 -0500 +++ b/Misc/NEWS Wed Mar 07 21:00:44 2012 +0100 @@ -101,8 +101,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. /merwok@netwok.org