[Python-checkins] r73352 - in python/branches/release30-maint: Lib/distutils/cygwinccompiler.py Misc/NEWS

[tarek.ziade]

Author: tarek.ziade
Date: Thu Jun 11 11:29:47 2009
New Revision: 73352

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

................
  r73351 | tarek.ziade | 2009-06-11 11:25:41 +0200 (Thu, 11 Jun 2009) | 9 lines
  
  Merged revisions 73348 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r73348 | tarek.ziade | 2009-06-11 11:13:36 +0200 (Thu, 11 Jun 2009) | 1 line
    
    #6263 fixed syntax error in distutils.cygwinccompiler
  ........
................


Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Lib/distutils/cygwinccompiler.py
   python/branches/release30-maint/Misc/NEWS

Modified: python/branches/release30-maint/Lib/distutils/cygwinccompiler.py
==============================================================================
--- python/branches/release30-maint/Lib/distutils/cygwinccompiler.py	(original)
+++ python/branches/release30-maint/Lib/distutils/cygwinccompiler.py	Thu Jun 11 11:29:47 2009
@@ -74,7 +74,7 @@
             # VS2008 / MSVC 9.0
             return ['msvcr90']
         else:
-            raise ValueError("Unknown MS Compiler version %i " % msc_Ver)
+            raise ValueError("Unknown MS Compiler version %s " % msc_ver)
 
 
 class CygwinCCompiler (UnixCCompiler):

Modified: python/branches/release30-maint/Misc/NEWS
==============================================================================
--- python/branches/release30-maint/Misc/NEWS	(original)
+++ python/branches/release30-maint/Misc/NEWS	Thu Jun 11 11:29:47 2009
@@ -323,6 +323,8 @@
 Library
 -------
 
+- Issue #6263: Fixed syntax error in distutils.cygwincompiler.
+
 - Issue #5201: distutils.sysconfig.parse_makefile() now understands `$$`
   in Makefiles. This prevents compile errors when using syntax like:
   `LDFLAGS='-rpath=\$$LIB:/some/other/path'`. Patch by Floris Bruynooghe.