cpython: 3d1362fa07c3 (original) (raw)

Mercurial > cpython

changeset 75426:3d1362fa07c3 3.2

Make distutils’ upload command work with bdist_msi products (#13719). Patch by Ralf Schmitt. [#13719]

Éric Araujo merwok@netwok.org
date	Mon, 05 Mar 2012 16:09:29 +0100
parents	d99c0a4b66f3
children	0860e8a24858
files	Lib/distutils/command/bdist_msi.py Lib/distutils/tests/test_bdist_msi.py Misc/NEWS
diffstat	3 files changed, 16 insertions(+), 6 deletions(-)[+] [-] Lib/distutils/command/bdist_msi.py 2 Lib/distutils/tests/test_bdist_msi.py 18 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', fullname[](#l1.7)

       tup = 'bdist_msi', self.target_version or 'any', installer_name[](#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,12 +1,11 @@ """Tests for distutils.command.bdist_msi.""" -import unittest import sys - +import unittest from test.support import run_unittest - from distutils.tests import support -@unittest.skipUnless(sys.platform=="win32", "These tests are only for win32") + +@unittest.skipUnless(sys.platform == 'win32', 'these tests require Windows') class BDistMSITestCase(support.TempdirManager, support.LoggingSilencer, unittest.TestCase): @@ -14,9 +13,18 @@ class BDistMSITestCase(support.TempdirMa def test_minimal(self): # minimal test XXX need more tests from distutils.command.bdist_msi import bdist_msi

   pkg_pth, dist = self.create_dist()[](#l2.23)

   project_dir, dist = self.create_dist()[](#l2.24)
   cmd = bdist_msi(dist)[](#l2.25)
   cmd.ensure_finalized()[](#l2.26)

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

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

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

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

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

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

+ def test_suite(): return unittest.makeSuite(BDistMSITestCase)

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -130,6 +130,8 @@ 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.