[Numpy-svn] r6199 - trunk/numpy/distutils

numpy-svn@scip... numpy-svn@scip...
Sat Dec 27 04:06:30 CST 2008


Author: cdavid
Date: 2008-12-27 04:06:25 -0600 (Sat, 27 Dec 2008)
New Revision: 6199

Modified:
   trunk/numpy/distutils/mingw32ccompiler.py
Log:
Fix some typo/syntax errors when converting dict access to a function in manifest generation.

Modified: trunk/numpy/distutils/mingw32ccompiler.py
===================================================================
--- trunk/numpy/distutils/mingw32ccompiler.py	2008-12-27 05:56:58 UTC (rev 6198)
+++ trunk/numpy/distutils/mingw32ccompiler.py	2008-12-27 10:06:25 UTC (rev 6199)
@@ -252,9 +252,9 @@
         try:
             import msvcrt
             if hasattr(msvcrt, "CRT_ASSEMBLY_VERSION"):
-                _MSVCRVER_TO_FULLVER = {'90': msvcrt.CRT_ASSEMBLY_VERSION}
+                _MSVCRVER_TO_FULLVER['90'] = msvcrt.CRT_ASSEMBLY_VERSION
             else:
-                _MSVCRVER_TO_FULLVER = {'90': "9.0.21022.8"}
+                _MSVCRVER_TO_FULLVER['90'] = "9.0.21022.8"
         except ImportError:
             # If we are here, means python was not built with MSVC. Not sure what to do
             # in that case: manifest building will fail, but it should not be used in
@@ -265,7 +265,7 @@
     """Given a major and minor version of the MSVCR, returns the
     corresponding XML file."""
     try:
-        fullver = msvcrt_version[str(maj * 10 + min)]
+        fullver = msvcrt_version(str(maj * 10 + min))
     except KeyError:
         raise ValueError("Version %d,%d of MSVCRT not supported yet" \
                          % (maj, min))



More information about the Numpy-svn mailing list