mirror of https://github.com/python/cpython
Backout buggy patch committed for #13719
This commit is contained in:
parent
30b8e5461d
commit
a420c820fe
|
@ -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:
|
||||||
|
|
|
@ -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():
|
||||||
|
|
|
@ -130,8 +130,6 @@ Core and Builtins
|
||||||
Library
|
Library
|
||||||
-------
|
-------
|
||||||
|
|
||||||
- Issue #13719: Make the distutils upload command aware of bdist_msi products.
|
|
||||||
|
|
||||||
- Issue #14195: An issue that caused weakref.WeakSet instances to incorrectly
|
- 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
|
return True for a WeakSet instance 'a' in both 'a < a' and 'a > a' has been
|
||||||
fixed.
|
fixed.
|
||||||
|
|
Loading…
Reference in New Issue