cpython: 7e629bacec87 (original) (raw)

Mercurial > cpython

changeset 75473:7e629bacec87 3.2

Backout buggy patch committed for #13719 [#13719]

Éric Araujo merwok@netwok.org
date	Wed, 07 Mar 2012 20:48:55 +0100
parents	7b65ea9c9972
children	e52a31b83062 95bbe3229cd0
files	Lib/distutils/command/bdist_msi.py Lib/distutils/tests/test_bdist_msi.py Misc/NEWS
diffstat	3 files changed, 1 insertions(+), 12 deletions(-)[+] [-] Lib/distutils/command/bdist_msi.py 2 Lib/distutils/tests/test_bdist_msi.py 9 Misc/NEWS 2

line wrap: on

line diff

--- 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[](#l1.7)

       tup = 'bdist_msi', self.target_version or 'any', fullname[](#l1.8)
       self.distribution.dist_files.append(tup)[](#l1.9)

if not self.keep_temp:

--- 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.TempdirMa project_dir, dist = self.create_dist() cmd = bdist_msi(dist) cmd.ensure_finalized()

```
   cmd.run()[](#l2.13)
```

   bdists = os.listdir(os.path.join(project_dir, 'dist'))[](#l2.15)

   self.assertEqual(bdists, ['foo-0.1.msi'])[](#l2.16)

   # bug #13719: upload ignores bdist_msi files[](#l2.18)

   self.assertEqual(dist.dist_files,[](#l2.19)

                    [('bdist_msi', 'any', 'dist/foo-0.1.msi')])[](#l2.20)

def test_suite():

--- 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.