[Python-checkins] r71422 - in python/branches/release26-maint: Lib/distutils/command/bdist_wininst.py Lib/distutils/tests/test_bdist_wininst.py Misc/NEWS

[tarek.ziade]

Author: tarek.ziade
Date: Fri Apr 10 00:48:19 2009
New Revision: 71422

Log:
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/release26-maint/Lib/distutils/tests/test_bdist_wininst.py
      - copied, changed from r71413, /python/trunk/Lib/distutils/tests/test_bdist_wininst.py
Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/distutils/command/bdist_wininst.py
   python/branches/release26-maint/Misc/NEWS

Modified: python/branches/release26-maint/Lib/distutils/command/bdist_wininst.py
==============================================================================
--- python/branches/release26-maint/Lib/distutils/command/bdist_wininst.py	(original)
+++ python/branches/release26-maint/Lib/distutils/command/bdist_wininst.py	Fri Apr 10 00:48:19 2009
@@ -344,10 +344,15 @@
         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()
 # class bdist_wininst

Copied: python/branches/release26-maint/Lib/distutils/tests/test_bdist_wininst.py (from r71413, /python/trunk/Lib/distutils/tests/test_bdist_wininst.py)
==============================================================================
--- /python/trunk/Lib/distutils/tests/test_bdist_wininst.py	(original)
+++ python/branches/release26-maint/Lib/distutils/tests/test_bdist_wininst.py	Fri Apr 10 00:48:19 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/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Fri Apr 10 00:48:19 2009
@@ -103,6 +103,9 @@
 Library
 -------
 
+- Issue #5731: Distutils bdist_wininst no longer worked on non-Windows 
+  platforms. Initial patch by Paul Moore.
+
 - Issue #1491431: Fixed distutils.filelist.glob_to_re for edge cases.
   Initial fix by Wayne Davison.