Merged revisions 66171 via svnmerge from

amauryfa · amauryfa · commit d8976f12d4e2 · 2008-09-02T23:22:56.000Z
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66171 | amaury.forgeotdarc | 2008-09-03 01:19:56 +0200 (mer., 03 sept. 2008) | 9 lines

  Issue 2975: when compiling multiple extension modules with visual studio 2008
  from the same python instance, some environment variables (LIB, INCLUDE)
  would grow without limit.

  Tested with these statements:
      distutils.ccompiler.new_compiler().initialize()
      print os.environ['LIB']
  But I don't know how to turn them into reliable unit tests.
........
diff --git a/Lib/distutils/msvc9compiler.py b/Lib/distutils/msvc9compiler.py
@@ -193,6 +193,17 @@ def normalize_and_reduce_paths(paths):
             reduced_paths.append(np)
     return reduced_paths
 
+def removeDuplicates(variable):
+    """Remove duplicate values of an environment variable.
+    """
+    oldList = variable.split(os.pathsep)
+    newList = []
+    for i in oldList:
+        if i not in newList:
+            newList.append(i)
+    newVariable = os.pathsep.join(newList)
+    return newVariable
+
 def find_vcvarsall(version):
     """Find the vcvarsall.bat file
 
@@ -252,12 +263,12 @@ def query_vcvarsall(version, arch="x86"):
         if '=' not in line:
             continue
         line = line.strip()
-        key, value = line.split('=')
+        key, value = line.split('=', 1)
         key = key.lower()
         if key in interesting:
             if value.endswith(os.pathsep):
                 value = value[:-1]
-            result[key] = value
+            result[key] = removeDuplicates(value)
 
     if len(result) != len(interesting):
         raise ValueError(str(list(result.keys())))
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -74,6 +74,10 @@ Library
 Extension Modules
 -----------------
 
+- Issue #2975: When compiling several extension modules with Visual Studio 2008
+  from the same python interpreter, some environment variables would grow
+  without limit.
+
 - Issue #3643: Added a few more checks to _testcapi to prevent segfaults by
   exploitation of poor argument checking.
 
