summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Tool/MSCommon/common.py
diff options
context:
space:
mode:
authorRocco Matano <devnull@localhost>2014-03-07 14:39:43 (GMT)
committerRocco Matano <devnull@localhost>2014-03-07 14:39:43 (GMT)
commitea1890249923aab9cda388b2d22b566dbb7b8949 (patch)
treeadf82b67b42bed5f5374239ece9fc1d1ce87960e /src/engine/SCons/Tool/MSCommon/common.py
parent8986df6b325e924f4143b03705129899fccc72ba (diff)
downloadSCons-ea1890249923aab9cda388b2d22b566dbb7b8949.zip
SCons-ea1890249923aab9cda388b2d22b566dbb7b8949.tar.gz
SCons-ea1890249923aab9cda388b2d22b566dbb7b8949.tar.bz2
fix some minor 2to3 issues on windows
Diffstat (limited to 'src/engine/SCons/Tool/MSCommon/common.py')
-rw-r--r--src/engine/SCons/Tool/MSCommon/common.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/engine/SCons/Tool/MSCommon/common.py b/src/engine/SCons/Tool/MSCommon/common.py
index e5c78e9..4a91310 100644
--- a/src/engine/SCons/Tool/MSCommon/common.py
+++ b/src/engine/SCons/Tool/MSCommon/common.py
@@ -115,11 +115,11 @@ def normalize_env(env, keys, force=False):
normenv = {}
if env:
for k in env.keys():
- normenv[k] = copy.deepcopy(env[k]).encode('mbcs')
+ normenv[k] = copy.deepcopy(env[k])
for k in keys:
if k in os.environ and (force or not k in normenv):
- normenv[k] = os.environ[k].encode('mbcs')
+ normenv[k] = os.environ[k]
# This shouldn't be necessary, since the default environment should include system32,
# but keep this here to be safe, since it's needed to find reg.exe which the MSVC
@@ -212,7 +212,6 @@ def parse_output(output, keep = ("INCLUDE", "LIB", "LIBPATH", "PATH")):
for p in plist:
# Do not add empty paths (when a var ends with ;)
if p:
- p = p.encode('mbcs')
# XXX: For some reason, VC98 .bat file adds "" around the PATH
# values, and it screws up the environment later, so we strip
# it.