[Python-checkins] r68084 - in python/branches/release30-maint: Lib/distutils/msvc9compiler.py Lib/distutils/tests/test_msvc9compiler.py Misc/NEWS

[tarek.ziade]

Author: tarek.ziade
Date: Wed Dec 31 00:10:41 2008
New Revision: 68084

Log:
Merged revisions 68083 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r68083 | tarek.ziade | 2008-12-31 00:09:20 +0100 (Wed, 31 Dec 2008) | 9 lines
  
  Merged revisions 68081 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r68081 | tarek.ziade | 2008-12-31 00:03:41 +0100 (Wed, 31 Dec 2008) | 1 line
    
    Fixed #4702: Throwing DistutilsPlatformError instead of IOError under win32 if MSVC is not found
  ........
................


Added:
   python/branches/release30-maint/Lib/distutils/tests/test_msvc9compiler.py
      - copied unchanged from r68083, /python/branches/py3k/Lib/distutils/tests/test_msvc9compiler.py
Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Lib/distutils/msvc9compiler.py
   python/branches/release30-maint/Misc/NEWS

Modified: python/branches/release30-maint/Lib/distutils/msvc9compiler.py
==============================================================================
--- python/branches/release30-maint/Lib/distutils/msvc9compiler.py	(original)
+++ python/branches/release30-maint/Lib/distutils/msvc9compiler.py	Wed Dec 31 00:10:41 2008
@@ -247,7 +247,7 @@
     result = {}
 
     if vcvarsall is None:
-        raise IOError("Unable to find vcvarsall.bat")
+        raise DistutilsPlatformError("Unable to find vcvarsall.bat")
     log.debug("Calling 'vcvarsall.bat %s' (version=%s)", arch, version)
     popen = subprocess.Popen('"%s" %s & set' % (vcvarsall, arch),
                              stdout=subprocess.PIPE,
@@ -255,7 +255,7 @@
 
     stdout, stderr = popen.communicate()
     if popen.wait() != 0:
-        raise IOError(stderr.decode("mbcs"))
+        raise DistutilsPlatformError(stderr.decode("mbcs"))
 
     stdout = stdout.decode("mbcs")
     for line in stdout.split("\n"):

Modified: python/branches/release30-maint/Misc/NEWS
==============================================================================
--- python/branches/release30-maint/Misc/NEWS	(original)
+++ python/branches/release30-maint/Misc/NEWS	Wed Dec 31 00:10:41 2008
@@ -45,6 +45,9 @@
 Library
 -------
 
+- Issue #4702: Throwing a DistutilsPlatformError instead of IOError in case 
+  no MSVC compiler is found under Windows. Original patch by Philip Jenvey. 
+
 - Issue #4646: distutils was choking on empty options arg in the setup 
   function. Original patch by Thomas Heller.