mirror of
https://github.com/python/cpython
synced 2024-10-17 11:18:07 +00:00
Merge 3.2
This commit is contained in:
commit
00b41fc828
|
@ -260,7 +260,7 @@ def run(self):
|
|||
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:
|
||||
|
|
|
@ -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 @@ def test_minimal(self):
|
|||
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():
|
||||
|
|
Loading…
Reference in a new issue