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 94a7bd9..2dabc0f 100644
--- a/Lib/distutils/cygwinccompiler.py
+++ b/Lib/distutils/cygwinccompiler.py
@@ -76,7 +76,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):
diff --git a/Misc/NEWS b/Misc/NEWS
index 11d3835..67d2689 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -234,6 +234,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.