From: Mark Hammond <mhammond@skippinet.com.au>
Date: Thu, 18 Sep 2008 03:51:46 +0000 (+0000)
Subject: avoid putting unicode objects in the environment causing
X-Git-Tag: v2.6rc2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=900155fa42a78b2c0b5fb6d01bb81264162d9fdc;p=python

avoid putting unicode objects in the environment causing
later test failures.  As discussed on #python-dev
---

diff --git a/Lib/distutils/msvc9compiler.py b/Lib/distutils/msvc9compiler.py
index 0b27428d05..804f1751ce 100644
--- a/Lib/distutils/msvc9compiler.py
+++ b/Lib/distutils/msvc9compiler.py
@@ -357,9 +357,10 @@ class MSVCCompiler(CCompiler) :
 
             vc_env = query_vcvarsall(VERSION, plat_spec)
 
-            self.__paths = vc_env['path'].split(os.pathsep)
-            os.environ['lib'] = vc_env['lib']
-            os.environ['include'] = vc_env['include']
+            # take care to only use strings in the environment.
+            self.__paths = vc_env['path'].encode('mbcs').split(os.pathsep)
+            os.environ['lib'] = vc_env['lib'].encode('mbcs')
+            os.environ['include'] = vc_env['include'].encode('mbcs')
 
             if len(self.__paths) == 0:
                 raise DistutilsPlatformError("Python was built with %s, "