[Python-checkins] cpython: Remove buggy change for #13719 in packaging
eric.araujo
python-checkins at python.org
Wed Mar 7 21:08:29 CET 2012
http://hg.python.org/cpython/rev/17106d7d34b4
changeset: 75475:17106d7d34b4
user: Éric Araujo <merwok at netwok.org>
date: Wed Mar 07 20:56:18 2012 +0100
summary:
Remove buggy change for #13719 in packaging
files:
Lib/packaging/command/bdist_msi.py | 2 +-
Lib/packaging/tests/test_command_bdist_msi.py | 9 ---------
Misc/NEWS | 3 ---
3 files changed, 1 insertions(+), 13 deletions(-)
diff --git a/Lib/packaging/command/bdist_msi.py b/Lib/packaging/command/bdist_msi.py
--- a/Lib/packaging/command/bdist_msi.py
+++ b/Lib/packaging/command/bdist_msi.py
@@ -261,7 +261,7 @@
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
--- 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 @@
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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -23,9 +23,6 @@
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.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list