[Numpy-svn] r4487 - branches/numpy.scons/numpy/distutils/scons

numpy-svn@scip... numpy-svn@scip...
Wed Nov 21 22:55:49 CST 2007


Author: cdavid
Date: 2007-11-21 22:55:44 -0600 (Wed, 21 Nov 2007)
New Revision: 4487

Modified:
   branches/numpy.scons/numpy/distutils/scons/configuration.py
Log:
Avoid 'stringifying' configres for NUMPY_PKG_CONFIG from the beginning

Modified: branches/numpy.scons/numpy/distutils/scons/configuration.py
===================================================================
--- branches/numpy.scons/numpy/distutils/scons/configuration.py	2007-11-22 03:40:16 UTC (rev 4486)
+++ branches/numpy.scons/numpy/distutils/scons/configuration.py	2007-11-22 04:55:44 UTC (rev 4487)
@@ -1,15 +1,19 @@
 #! /usr/bin/env python
-# Last Change: Thu Nov 01 06:00 PM 2007 J
+# Last Change: Thu Nov 22 12:00 PM 2007 J
 import os
 
 def add_info(env, name, opt):
     cfg = env['NUMPY_PKG_CONFIG']
-    cfg[name] = str(opt)
+    cfg[name] = opt
 
 def write_info(env):
     dir = os.path.dirname(env['NUMPY_PKG_CONFIG_FILE'])
     if not os.path.exists(dir):
         os.makedirs(dir)
+    cfg = env['NUMPY_PKG_CONFIG']
+    config_str = {}
+    for k, i in cfg.items():
+        config_str[k] = str(i)
     f = open(env['NUMPY_PKG_CONFIG_FILE'], 'w')
-    f.writelines("config = %s" % str(env['NUMPY_PKG_CONFIG']))
+    f.writelines("config = %s" % str(config_str))
     f.close()



More information about the Numpy-svn mailing list