diff options
| author | Éric Araujo <merwok@netwok.org> | 2012-03-07 19:50:06 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2012-03-07 19:50:06 (GMT) |
| commit | 00b41fc8283823eda6347c282d922a5edc15c37d (patch) | |
| tree | 6510c405adaf4d2ff2a6c63f6956549eee2a96c8 /Lib | |
| parent | 7f4fdb266a10c3d7959130fad93e89ed849cd6ed (diff) | |
| parent | a420c820fe243cbc0d729e9c60f8a93810e973a7 (diff) | |
| download | cpython-00b41fc8283823eda6347c282d922a5edc15c37d.zip cpython-00b41fc8283823eda6347c282d922a5edc15c37d.tar.gz cpython-00b41fc8283823eda6347c282d922a5edc15c37d.tar.bz2 | |
Merge 3.2
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/distutils/command/bdist_msi.py | 2 | ||||
| -rw-r--r-- | 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 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(): |