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
........

diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py
index 94a7bd96ee325552da39abe30c335ca908082678..2dabc0f0feb5033560ea682ee692f4edff36e4ba 100644 (file)
--- a/Lib/distutils/cygwinccompiler.py
+++ b/Lib/distutils/cygwinccompiler.py
@@ -76,7 +76,7 @@ def get_msvcr():
             # 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):

diff --git a/Misc/NEWS b/Misc/NEWS
index 11d38359273f7cab75f2429c9757a76c88ff6a30..67d2689ef21c301957478294803405ae4d8b73a2 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -234,6 +234,8 @@ Core and Builtins
 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.