[Python-checkins] r71423 - in python/branches/release30-maint: Lib/distutils/command/bdist_wininst.py Lib/distutils/tests/test_bdist_wininst.py Misc/NEWS
tarek.ziade
python-checkins at python.org
Fri Apr 10 00:51:41 CEST 2009
Author: tarek.ziade
Date: Fri Apr 10 00:51:41 2009
New Revision: 71423
Log:
Merged revisions 71415 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r71415 | tarek.ziade | 2009-04-10 00:02:39 +0200 (Fri, 10 Apr 2009) | 9 lines
Merged revisions 71413 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71413 | tarek.ziade | 2009-04-09 23:36:44 +0200 (Thu, 09 Apr 2009) | 1 line
Fixed #5731: Distutils bdist_wininst no longer worked on non-Windows platforms
........
................
Added:
python/branches/release30-maint/Lib/distutils/tests/test_bdist_wininst.py
- copied, changed from r71415, /python/branches/py3k/Lib/distutils/tests/test_bdist_wininst.py
Modified:
python/branches/release30-maint/ (props changed)
python/branches/release30-maint/Lib/distutils/command/bdist_wininst.py
python/branches/release30-maint/Misc/NEWS
Modified: python/branches/release30-maint/Lib/distutils/command/bdist_wininst.py
==============================================================================
--- python/branches/release30-maint/Lib/distutils/command/bdist_wininst.py (original)
+++ python/branches/release30-maint/Lib/distutils/command/bdist_wininst.py Fri Apr 10 00:51:41 2009
@@ -330,9 +330,14 @@
directory = os.path.dirname(__file__)
# we must use a wininst-x.y.exe built with the same C compiler
# used for python. XXX What about mingw, borland, and so on?
- if self.plat_name == 'win32':
- sfix = ''
+
+ # if plat_name starts with "win" but is not "win32"
+ # we want to strip "win" and leave the rest (e.g. -amd64)
+ # for all other cases, we don't want any suffix
+ if self.plat_name != 'win32' and self.plat_name[:3] == 'win':
+ sfix = self.plat_name[3:]
else:
- sfix = self.plat_name[3:] # strip 'win' - leaves eg '-amd64'
+ sfix = ''
+
filename = os.path.join(directory, "wininst-%.1f%s.exe" % (bv, sfix))
return open(filename, "rb").read()
Copied: python/branches/release30-maint/Lib/distutils/tests/test_bdist_wininst.py (from r71415, /python/branches/py3k/Lib/distutils/tests/test_bdist_wininst.py)
==============================================================================
--- /python/branches/py3k/Lib/distutils/tests/test_bdist_wininst.py (original)
+++ python/branches/release30-maint/Lib/distutils/tests/test_bdist_wininst.py Fri Apr 10 00:51:41 2009
@@ -1,6 +1,8 @@
"""Tests for distutils.command.bdist_wininst."""
import unittest
+import os
+from distutils.dist import Distribution
from distutils.command.bdist_wininst import bdist_wininst
from distutils.tests import support
@@ -12,7 +14,10 @@
# issue5731: command was broken on non-windows platforms
# this test makes sure it works now for every platform
# let's create a command
- pkg_pth, dist = self.create_dist()
+ tmp_dir = self.mkdtemp()
+ pkg_dir = os.path.join(tmp_dir, 'foo')
+ os.mkdir(pkg_dir)
+ dist = Distribution()
cmd = bdist_wininst(dist)
cmd.ensure_finalized()
Modified: python/branches/release30-maint/Misc/NEWS
==============================================================================
--- python/branches/release30-maint/Misc/NEWS (original)
+++ python/branches/release30-maint/Misc/NEWS Fri Apr 10 00:51:41 2009
@@ -216,6 +216,9 @@
Library
-------
+- Issue #5731: Distutils bdist_wininst no longer worked on non-Windows
+ platforms. Initial patch by Paul Moore.
+
- Issue #4998: The memory saving effect of __slots__ had been lost on Fractions
which inherited from numbers.py which did not have __slots__ defined. The
numbers hierarchy now has its own __slots__ declarations.
More information about the Python-checkins
mailing list