mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-04 11:49:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge 3.2

Browse source
This commit is contained in:
Éric Araujo 2012-03-07 20:50:06 +01:00
commit 00b41fc828
2 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/distutils/command/bdist_msi.py
View file

@ -260,7 +260,7 @@ class bdist_msi(Command):
self.db.Commit() self.db.Commit()
if hasattr(self.distribution, 'dist_files'): 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) self.distribution.dist_files.append(tup)
if not self.keep_temp: if not self.keep_temp:

9
Lib/distutils/tests/test_bdist_msi.py
View file

@ -1,5 +1,4 @@
"""Tests for distutils.command.bdist_msi.""" """Tests for distutils.command.bdist_msi."""
import os
import sys import sys
import unittest import unittest
from test.support import run_unittest from test.support import run_unittest
@ -17,14 +16,6 @@ class BDistMSITestCase(support.TempdirManager,
project_dir, dist = self.create_dist() project_dir, dist = self.create_dist()
cmd = bdist_msi(dist) cmd = bdist_msi(dist)
cmd.ensure_finalized() 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(): def test_suite():