summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/packaging/command/bdist_msi.py2
-rw-r--r--Lib/packaging/tests/test_command_bdist_msi.py9
-rw-r--r--Misc/NEWS3
3 files changed, 1 insertions, 13 deletions
diff --git a/Lib/packaging/command/bdist_msi.py b/Lib/packaging/command/bdist_msi.py
index ad1edef..995eec5 100644
--- a/Lib/packaging/command/bdist_msi.py
+++ b/Lib/packaging/command/bdist_msi.py
@@ -261,7 +261,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/packaging/tests/test_command_bdist_msi.py b/Lib/packaging/tests/test_command_bdist_msi.py
index 25973ef..86754a8 100644
--- a/Lib/packaging/tests/test_command_bdist_msi.py
+++ b/Lib/packaging/tests/test_command_bdist_msi.py
@@ -1,5 +1,4 @@
"""Tests for distutils.command.bdist_msi."""
-import os
import sys
from packaging.tests import unittest, support
@@ -16,14 +15,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():
diff --git a/Misc/NEWS b/Misc/NEWS
index 2cf22cb..f3e591c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -23,9 +23,6 @@ Library
Also, add a multiprocessing.connection.wait(rlist, timeout=None) function
for polling multiple objects at once. Patch by sbt.
-- Issue #13719: Make the distutils and packaging upload commands aware of
- bdist_msi products.
-
- Issue #14007: Accept incomplete TreeBuilder objects (missing start, end,
data or close method) for the Python implementation as well.
Drop the no-op TreeBuilder().xml() method from the C implementation.