Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2fa0cbc

Browse files
committed
Remove buggy change for #13719 in packaging
1 parent 00b41fc commit 2fa0cbc

3 files changed

Lines changed: 1 addition & 13 deletions

File tree

Lib/packaging/command/bdist_msi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ def run(self):
261261
self.db.Commit()
262262

263263
if hasattr(self.distribution, 'dist_files'):
264-
tup = 'bdist_msi', self.target_version or 'any', installer_name
264+
tup = 'bdist_msi', self.target_version or 'any', fullname
265265
self.distribution.dist_files.append(tup)
266266

267267
if not self.keep_temp:

Lib/packaging/tests/test_command_bdist_msi.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
"""Tests for distutils.command.bdist_msi."""
2-
import os
32
import sys
43

54
from packaging.tests import unittest, support
@@ -16,14 +15,6 @@ def test_minimal(self):
1615
project_dir, dist = self.create_dist()
1716
cmd = bdist_msi(dist)
1817
cmd.ensure_finalized()
19-
cmd.run()
20-
21-
bdists = os.listdir(os.path.join(project_dir, 'dist'))
22-
self.assertEqual(bdists, ['foo-0.1.msi'])
23-
24-
# bug #13719: upload ignores bdist_msi files
25-
self.assertEqual(dist.dist_files,
26-
[('bdist_msi', 'any', 'dist/foo-0.1.msi')])
2718

2819

2920
def test_suite():

Misc/NEWS

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ Library
2323
Also, add a multiprocessing.connection.wait(rlist, timeout=None) function
2424
for polling multiple objects at once. Patch by sbt.
2525

26-
- Issue #13719: Make the distutils and packaging upload commands aware of
27-
bdist_msi products.
28-
2926
- Issue #14007: Accept incomplete TreeBuilder objects (missing start, end,
3027
data or close method) for the Python implementation as well.
3128
Drop the no-op TreeBuilder().xml() method from the C implementation.

0 commit comments

Comments
 (0)