From: Tarek Ziadé <ziade.tarek@gmail.com>
Date: Thu, 11 Jun 2009 09:29:47 +0000 (+0000)
Subject: Merged revisions 73351 via svnmerge from
X-Git-Tag: 3.0~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03e8b38e370566eafd0b53f8ece108b4b05e9cab;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py
index ea4c7971fd07..0e4059165418 100644
--- a/Lib/distutils/cygwinccompiler.py
+++ b/Lib/distutils/cygwinccompiler.py
@@ -74,7 +74,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 e2bb2f3ba501..2dd00e4d0b20 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -323,6 +323,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.